Suppose I have following branches
harryxiyou@common_vm ~/forest/sqle/sqle/scripts $ git branch
* dev-harry
master
rc
After I did some changes on dev-harry branch, I wanted to merge dev-harry into rc branch.
1, git checkout rc
2, git merge dev-harry
References:
http://stackoverflow.com/questions/24147169/merge-two-remote-branches-in-git
https://www.atlassian.com/git/tutorials/using-branches
http://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging
I usually add --no-ff during git merge to force git to add a commit for the merge operation.
Yeah, it is more reasonable ;-)