You may have fallen into the `git checkout -b <name>` trap. What isn't always realised is that checkout WILL merge in the current HEAD, or whatever start point is given, so you can accidently start with a dirty worktree, so the second merge (the one you are testing) will/could have the conflicts you are seeing.
ensure you have a clean/reset work tree before you start, and see if that fixes it. If it doesn't, please provide full command history (inluding a few prvious commands) so we can see you setup steps and the steps you used to create the issue you are seeing. Philip ----- Original Message ----- From: Kui Yuan To: Git for human beings Sent: Monday, October 24, 2016 8:45 AM Subject: [git-users] magical thing about `git merge` in out project ,there is a commit, which is merged from two branches,as show below: git cat-file -p b20cbbc775 tree 592aa5b53aa875119ac01160b50e044a69c203ea parent 19a0ffaa0368b01d675fd548f976685b643f0886 parent ee7b28350a5a2bc6d6ef171a403b2547be0a849d author xxx <[email protected]>; 1474607755 +0800 committer xxx <[email protected]>; 1474607755 +0800 Merge branch 'feature/local_delivery' into hotfix/local_delivery_0923 according to the command and output, we can see the commit b20cbbc775 is merge from the commit 19a0ffaa0368b01d675fd548f976685b643f0886 and commit ee7b28350a5a2bc6d6ef171a403b2547be0a849d ========================================================== yes, till now, that all works fine~ but when I try to re-merge the two commit 19a0ffaa0368b01d675fd548f976685b643f0886 and ee7b28350a5a2bc6d6ef171a403b2547be0a849d it reports many conflicts. but the first time I merged it, It works all ok~,as showed in the default commit log~ git co 19a0ffaa0368b01d675fd548f976685b643f0886 -b merge git merge ee7b28350a5a2bc6d6ef171a403b2547be0a849d ......... both modified: v2/wap/xxxxxxxxxxxxxxxore.php both modified: v2/wap/xxxxxxxxxxxxxxxods.php both modified: v2/wap/xxxxxxxxxxxxxard.php both modified: v2/wap/xxxxxxxxxxxxxxxxxxxge.php both modified: v2/wap/xxxxxxxxxxxxxxxxeV2.php both modified: v2/xxxxxxxxxxxxxxxxtore.php deleted by them: v2/wxxxxxxxxxxxxxxxrt.php both modified: v2/wwxxxxxxxxxxxxx.html both modified: v2/wxxxxxxxxxxxxxxxxxxx.php so what is wrong with it? why it conflicts many days later, bug not conflict the first time I merge them? Is it a git bug? -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout. -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
