git rebase --continue 不起作用

Question

I did git rebase master , fixed the conflicts reported in a file, and then git add the file to resolve the conflict. Then I did git rebase --continue , and got this:

Applying: Fixed unit test

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".

Any idea what I am missing here? Should I do git rebase --skip?

Answer 1

If you are in Mac OS X, then first of all you should disable revisiond , as it can mess with files in your work tree in the middle of rebase, causing unpredictable and broken behavior:

git config --global core.trustctime false

The issue is explained in this article , and big thanks to @nickfalk who pointed it out.

As for your rebase, this kind of situation is not unusual in practice. Let's try to think through the steps of what's happening:

• When you rebase the current branch on top of another branch, git moves the HEAD to the other branch, and starts applying the unique commits you have in your current branch.

• While replaying one of those commits, you reached a conflict. You resolved it, but as a result there are no changes to commit, nothing to replay in this commit.

Practically, this means that you rejected the changes in the current commit being replayed. So, if you don't need anything from this commit, it's normal to skip it. So git rebase --skip makes sense here.

Answer 2

Breath, you're not going crazy! ;-= This is a known bug where OSX (if that is indeed what you're using) is messing with git, it is detailed here (not by me).

Short story (ie the fix) is:

git config --global core.trustctime false

Answer 3

I had a similar problem in my project and solved by putting the --preserve-merges option to the rebase command. In my project, this problem was caused by a merge commit, which is an "empty commit". Using git rebase --preserve-merges it takes the merge commit and continues the merge without breaking the commit tree.

Answer 4

I tried all the methods but nothing worked for me. If you are not in the middle of a rebase but git keeps complaining, then try the following. This worked for me for OSX.

rm -fr ".git/rebase-apply"

Answer 5

It could well mean that the changes are already rebased. Just check the git status.

Answer 6

None of the above suggestions worked. I found out that I had this issue because I did a hard reset of the master branch, while my feature branch had some legacy master commits (don't asked me how - no idea :( ).

I copied my changes out to a temporary directory, deleted my feature branch, copied them back in, and restarted from scratch. Ugly but effective. Not suggested if you're trying to keep more than one commit in your feature branch. Not suggested unless you have tried EVERYTHING ELSE .

UPDATE: This worked, but a better approach has been pointed out to me in the comments below. Take a look.

Answer 7

git add . will unblock you from this state, but if you resolved all conflicts by accepting the incoming changes, there is no diff to add so git thinks the conflict wasn't resolved as far as the rebase is concerned.

I took a low brow approach that worked without relying on side effects of using mysterious git config changes etc:

• Added harmless content (eg // on one line) to each file in conflict (to give git something to add )
• git add .
• git rebase --continue
• remove harmless comment

All sorted 🙂