0
這是2分支master和sprint1的圖表。當兩個分支合併時,我預計「第二次提交」(Wed Oct 19 19:58:15 2016 -0400)在「衝刺1第一次提交」(Wed Oct 19 19:57:13 2016 -0400)之後,因爲這是時間在「衝刺1第一次提交」提交時間旁邊。git合併帳戶提交時間戳?
問題:合併是如何發生的?被考慮的時間戳會影響它嗎?
ds-MacBook-Pro:Test1 aks$ git log --graph
* commit 48bbcabf5d50e080c82e71ce8661571f061a35c2
|\ Merge: b59ca50 e1195c7
| | Author: hmanan <[email protected]>
| | Date: Wed Oct 19 19:59:53 2016 -0400
| |
| | merge commit
| |
| * commit e1195c7230fd50b3831b3c1ab597bb691c593550
| | Author: hmanan <[email protected]>
| | Date: Wed Oct 19 19:58:15 2016 -0400
| |
| | second commit
| |
* | commit b59ca508357f151520ce7c88c5cc439992bc477c
| | Author: hmanan <[email protected]>
| | Date: Wed Oct 19 19:59:22 2016 -0400
| |
| | sprint 1 third commit
| |
* | commit 68064f65d2570b8f0c22273b431444610c49d97d
|/ Author: hmanan <[email protected]>
| Date: Wed Oct 19 19:58:56 2016 -0400
|
| sprint 1 second commit
|
* commit f9b26255345373f2cb63d26845d2c651527e13ac
| Author: hmanan <[email protected]>
| Date: Wed Oct 19 19:57:13 2016 -0400
|
| Sprint 1 first commit
|
* commit faa866e8d994f32feed8c1d5e26d4d5eb4197a6f
Author: hmanan <[email protected]>
Date: Wed Oct 19 19:55:28 2016 -0400
first commit
時間戳無關用git合併。合併創建一個提交,它是另外兩個提交的後繼(除非使用--squash)。就這樣。 – bmargulies