2018-03-08T12:18:16Z||2018-03-08T12:18:16Z


描述一下场景,你在使用git rebase做rebase操作。然后发现没有可以提交的,git status给出的结果是:

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

nothing to commit, working tree clean

接着当然就是继续运行git rebase --continue,但是又会报错:

Applying: Fix xxx issue
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.

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

这种情况是,可能这个Patch已经被合并过了,所以没什么需要提交的了,可以省略掉这个commit,运行:

git rebase --skip

{ true}