How to merge git branches quickly and correctly

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.

asked Jan 6, 2015 by harryxiyou (5,830 points)

1 Answer

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

commented Jan 6, 2015 by Eric Z Ma (44,280 points)

Yeah, it is more reasonable ;-)

commented Jan 6, 2015 by harryxiyou (5,830 points)

Please log in or register to answer this question.

Related questions

1 answer
1 answer
1 answer
asked Feb 5, 2013 by anonymous
1 answer
1 answer
Copyright © SysTutorials. User contributions licensed under cc-wiki with attribution required.
Hosted on Dreamhost

...