gitºÏ²¢·ÖÖ§ÕýÈ··½·¨_ÈçºÎ¿ìËÙÕýÈ·µØºÏ²¢git·ÖÖ§

gitºÏ²¢·ÖÖ§ÕýÈ··½·¨

Suppose I have following branches

¼ÙÉèÎÒÓÐÒÔÏ·ÖÖ§

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

harryxiyou @ common_vm/ forest / sqle / sqle / scripts $ git ·ÖÖ§
*¿ª·¢
Ö÷
rc

After I did some changes on dev-harry branch, I wanted to merge dev-harry into rc branch.

ÔÚdev-harry·ÖÖ§ÉϽøÐÐÁËһЩ¸ü¸ÄÖ®ºó，ÎÒÏ뽫 dev-harry ºÏ²¢µ½rc·ÖÖ§ÖС£

1, git checkout rc
2, git merge dev-harry

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

²Î¿¼ÎÄÏ×：
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

Answered by harryxiyou.

ÓÉharryxiyou»Ø´ð¡£

---

---

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

ÎÒͨ³£ÔÚgit mergeÆÚ¼äÌí¼Ó--no-ff ，ÒÔÇ¿ÖÆgitΪºÏ²¢²Ù×÷Ìí¼ÓÌá½» ¡£

---

---

Yeah, it is more reasonable ;-)

ÊǵÄ，Õâ¸üºÏÀí;-)

·­Òë×Ô: https://www.systutorials.com/how-to-merge-git-branches-quickly-and-correctly/

gitºÏ²¢·ÖÖ§ÕýÈ··½·¨