Created
November 12, 2013 07:16
-
-
Save lukin0110/7426846 to your computer and use it in GitHub Desktop.
Switch branches: http://stackoverflow.com/questions/2763006/change-the-current-branch-to-master-in-git
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| git checkout better_branch | |
| git merge --strategy=ours master # keep the content of this branch, but record a merge | |
| git checkout master | |
| git merge better_branch # fast-forward master up to the merge |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment