I had a problem yesterday I am not able to reproduce. But I am pretty sure many people have seen the same error.
I was in the middle of fixing a tiny simple git conflict, I did git add the changes and then did a git rebase --continue where I got the following output:
Applying: Better Copyright check (with year); exception for BluePyOpt License
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".
However, git status shows there is nothing to add:
$ git st
rebase in progress; onto 4e1e5a8
You are currently rebasing branch 'dev' on '4e1e5a8'.
(all conflicts fixed: run "git rebase --continue")
nothing to commit, working tree clean
What can cause such a state you never can exit? (I want to reproduce this problem to find a solution myself even I can understand).