为什么Git会记住并使用来自中止rebase的冲突解决而不询问我？ [英] Why does Git remember and use a conflict resolution from an aborted rebase without asking me?

问题描述

我在分支上做了一个rebase foo

  git rebase master 
  

做了一些冲突解决，然后决定我不想这样做，然后放弃。 / p>

  git rebase --abort 
  

所有的分支日志历史看起来都很正常。

  git rebase master 
   pre> 
 
 
当git第一次碰到它碰到的第一个冲突时，它就像之前一样将文件列为冲突。但不是标记与<<<<<<><<<<<<<<> c>>等的冲突，它只是在我第一次解决冲突之后，这很有趣，它有这个功能......但我实际上想要以不同的方式解决其中一个冲突，所以我不希望它记住并重新申请。
 
 
 
到底什么是在这里，我可以把它关掉？
解决方案
您可以使用rerere的忘记功能擦除记住冲突解决。 
I did a rebase on my branch foo
git rebase master
Did some conflict resolutions, then decided I didn't want to do it, and aborted.
git rebase --abort
All the branch log histories look normal. Now I want to start the same process again.
git rebase master
When git hits the first conflict that it hit the first time, it lists the files as in conflict just like it did before. BUT instead of marking up the conflict with <<<<< etc, it just shows the file in its state after I resolved the conflict the first time. This is interesting that it has this feature… but I actually want to resolve one of the conflicts differently, so I don't want it to remember and re-apply.

What exactly is going on here, and can I turn it off?
解决方案
You can use rerere's "forget" function to erase a remembered conflict resolution.

                        
这篇关于为什么Git会记住并使用来自中止rebase的冲突解决而不询问我？的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！