在 git 添加/变基的循环中 --继续

Question

有一个文件在

git rebase
CONFLICT (modify/delete): python/pyspark/hbase.py deleted in HEAD and modified in Python support. Version Python support of python/pyspark/hbase.py left in tree.
Failed to merge in the changes.
Patch failed at 0002 Python support
The copy of the patch that failed is found in:
   /shared/hwspark/.git/rebase-apply/patch
When you have resolved this problem, run "git rebase --continue".

我在文件上做了一个 git rm -f

git rm  -f python/pyspark/hbase.py

现在 git 说所有合并冲突都解决了。

$git status
rebase in progress; onto a153ab6
You are currently rebasing branch 'hbase' on 'a153ab6'.
  (all conflicts fixed: run "git rebase --continue")

但是，当我们"遵循指示"时：

$git rebase --continue
Applying: Python support
No changes - did you forget to use 'git add'?
If there is nothing left to stage, chances are that something else
already introduced the same changes; you might want to skip this patch.
When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".

那么应该怎么做才能清理呢？

Answer 1

如果没有什么可以上演的，很可能还有其他东西 已经引入了相同的更改;您可能想跳过此内容 补丁。

正如消息所暗示的那样，您想立即执行git rebase --skip。