Created
April 25, 2012 21:35
-
-
Save amiel/2493655 to your computer and use it in GitHub Desktop.
git checkout --merge example
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 some_branch | |
| error: Your local changes to the following files would be overwritten by checkout: | |
| Gemfile | |
| Please, commit your changes or stash them before you can switch branches. | |
| Aborting | |
| $ git stash | |
| $ git checkout some_branch | |
| $ git stash pop |
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 --merge some_branch |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment