How to merge git branches quickly and correctly

Suppose I have following branches

harryxiyou@common_vm ~/forest/sqle/sqle/scripts $ git branch
* dev-harry

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


I usually add --no-ff during git merge to force git to add a commit for the merge operation.

Yeah, it is more reasonable ;-)

Leave a Reply

Your email address will not be published. Required fields are marked *