You need to use ‘git rebase --skip’ to skip the empty patch.
As of Git 1.7.2, the error message tells you what to do, so I’m marking this
fixed.
https://github.com/gitster/git/commit/05bdcfe5fc3d626b752c2cb574f05ed30b279bcf
$ git rebase --continue
Applying: Add c
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 would prefer to skip this patch, instead run "git rebase --skip".
To check out the original branch and stop rebasing run "git rebase --abort".
** Changed in: git (Ubuntu)
Status: New => Fix Released
--
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
https://bugs.launchpad.net/bugs/753596
Title:
Unable to rebase --continue with empty commit
To manage notifications about this bug go to:
https://bugs.launchpad.net/ubuntu/+source/git/+bug/753596/+subscriptions
--
ubuntu-bugs mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
