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
http://git-scm.com/book/en/Git-Branching-Basic-Branching-and-Merging | |
// adding branch2 commets to branch1 | |
$ git checkout <branch1> | |
$ git merge <branch2> | |
// merging a branch to main | |
$ git checkout main | |
$ git merge <branch needed to be merged to main> |