Created
July 24, 2012 14:46
-
-
Save hugodias/3170376 to your computer and use it in GitHub Desktop.
Basic Git Merge
This file contains 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 init | |
git add . | |
git commit -m 'Primeiro commit' | |
git checkout -b issue1 | |
# Modify files | |
git add . | |
git commit -m 'Fixed issue1' | |
git checkout master | |
git add . | |
git commit -m 'Merging' | |
git merge issue1 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment