删除/修改冲突后,Git rebase不会继续

Question

我正处于我的主人对舞台分支的重新考虑之中

git checkout stage
git rebase master

有时我删除了两个文件,然后根据GIT修改了两个文件.

warning: too many files, skipping inexact rename detection
CONFLICT (delete/modify): test-recommendation-result.php deleted in HEAD and modified in [Bug] Fix test recommender. Version [Bug] Fix test recommender of test-recommendation-result.php left in tree.
CONFLICT (delete/modify): test-recommendation.php deleted in HEAD and modified in [Bug] Fix test recommender. Version [Bug] Fix test recommender of test-recommendation.php left in tree.
Failed to merge in the changes.
Patch failed at 0015.

我想说"是的git,继续并删除那些文件"所以....

git rm test-recommendation-result.php
git rm test-recommendation.php
git rebase --continue

Git说:

Applying [Bug] Fix test recommender
No changes - did you forget to use 'git add', Stupid?

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".

我说"不要叫我"愚蠢"而且只是做我告诉你的事情!"

我们现在处于僵局.谁是对的,我该如何解决这个问题？

Answer 1

做git add -A后面git rebase --continue.这应该添加所有更改 - 包括删除文件,然后继续.

无法保证提交没有其他文件没有冲突并且应该合并.git rebase --skip会失去那些文件.你不希望这样.

希望这可以帮助.