Git merge时使用--no-ff参数

2019独角兽企业重金招聘Python工程师标准>>>

 

通常，合并分支时，如果可能，Git会用Fast forward模式，但这种模式下，删除分支后，会丢掉分支信息。

如果要强制禁用Fast forward模式，Git就会在merge时生成一个新的commit，这样，从分支历史上就可以看出分支信息。

下面我们实战一下--no-ff方式的git merge：

Administrator@EZ-20170513RQHH MINGW32 /d/workspace/learngit/learn2 (master)
$ git checkout -b dev
Switched to a new branch 'dev'

Administrator@EZ-20170513RQHH MINGW32 /d/workspace/learngit/learn2 (dev)
$ ls
abc.txt  dd  ddd.txt  READMYFILE

Administrator@EZ-20170513RQHH MINGW32 /d/workspace/learngit/learn2 (dev)
$ vi abc.txt

Administrator@EZ-20170513RQHH MINGW32 /d/workspace/learngit/learn2 (dev)
$ git add abc.txt
warning: LF will be replaced by CRLF in abc.txt.
The file will have its original line endings in your working directory.

Administrator@EZ-20170513RQHH MINGW32 /d/workspace/learngit/learn2 (dev)
$ git commit -m 'add merge'
[dev 4fe2eaf] add merge
 1 file changed, 1 insertion(+)

Administrator@EZ-20170513RQHH MINGW32 /d/workspace/learngit/learn2 (dev)
$ git checkout master
Switched to branch 'master'
Your branch is up-to-date with 'origin/master'.

Administrator@EZ-20170513RQHH MINGW32 /d/workspace/learngit/learn2 (master)
$ git merge --no-ff -m 'merge with no-ff' dev
Merge made by the 'recursive' strategy.
 abc.txt | 1 +
 1 file changed, 1 insertion(+)

Administrator@EZ-20170513RQHH MINGW32 /d/workspace/learngit/learn2 (master)
$ git status
On branch master
Your branch is ahead of 'origin/master' by 2 commits.
  (use "git push" to publish your local commits)
nothing to commit, working tree clean

Administrator@EZ-20170513RQHH MINGW32 /d/workspace/learngit/learn2 (master)
$ git log --graph --pretty=oneline --abbrev-commit
*   0b655f8 (HEAD -> master) merge with no-ff
|\
| * 4fe2eaf (dev) add merge
|/
*   d2ac9a9 (origin/master, origin/HEAD) merge
|\
| * 62feb86 feature
* | a1d0ee6 master
|/
*   2360738 conflict fixed
|\
| * 22f91d7 READ
* | 4518e6a by master
|/
*   c01f0f2 Merge branch 'master' of github.com:ZhuBaker/learngit
|\
| * 6af3724 abc
| * ed9c88d dddd
| * 0fefcee dd
| *   1c508f7 Merge branch 'master' of github.com:ZhuBaker/learngit
| |\
| | * 78b85de abc
| * 7e13181 abc
:

Administrator@EZ-20170513RQHH MINGW32 /d/workspace/learngit/learn2 (master)
$ git branch -d dev
Deleted branch dev (was 4fe2eaf).

Administrator@EZ-20170513RQHH MINGW32 /d/workspace/learngit/learn2 (master)
$ git log --graph --pretty=oneline --abbrev-commit
*   0b655f8 (HEAD -> master) merge with no-ff
|\
| * 4fe2eaf add merge
|/
*   d2ac9a9 (origin/master, origin/HEAD) merge
|\
| * 62feb86 feature
* | a1d0ee6 master
|/
*   2360738 conflict fixed
|\
| * 22f91d7 READ
* | 4518e6a by master
|/
*   c01f0f2 Merge branch 'master' of github.com:ZhuBaker/learngit
|\
| * 6af3724 abc
| * ed9c88d dddd
| * 0fefcee dd
| *   1c508f7 Merge branch 'master' of github.com:ZhuBaker/learngit
| |\
| | * 78b85de abc
| * 7e13181 abc
:

分支策略

在实际开发中，我们应该按照几个基本原则进行分支管理：

首先，master分支应该是非常稳定的，也就是仅用来发布新版本，平时不能在上面干活；

那在哪干活呢？干活都在dev分支上，也就是说，dev分支是不稳定的，到某个时候，比如1.0版本发布时，再把dev分支合并到master上，在master分支发布1.0版本；

你和你的小伙伴们每个人都在dev分支上干活，每个人都有自己的分支，时不时地往dev分支上合并就可以了。

所以，团队合作的分支看起来就像这样：

小结

Git分支十分强大，在团队开发中应该充分应用。

合并分支时，加上--no-ff参数就可以用普通模式合并，合并后的历史有分支，能看出来曾经做过合并，而fast forward合并就看不出来曾经做过合并。

 

 

 

 

 

 

 

转载于:https://my.oschina.net/LucasZhu/blog/1550873