Created
June 11, 2015 20:41
-
-
Save vilmarbfilho/ac4f4bc85dd13489e311 to your computer and use it in GitHub Desktop.
Merge branchs
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
| first step: git merge <branch> | |
| second step: solve conflicts | |
| third step: git commit | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment