我正在将我的主分支(master) 与一个暂存分支(stage branch) 进行合并
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".
我说“不要叫我‘傻瓜’,只需按照我告诉你的做!”
现在我们陷入了僵局。谁是对的,我该怎么解决这个问题?
rebase --continue
将会起作用。 - Cascabel