Hello, git rebase is confused about commits like https://github.com/pfalcon/civetweb/commit/ce8493837bf7676c6d824cdcb1d5e3a7ed476fe1 - it stops, telling user to just run rebase --continue. I remember like few years ago rebase was confused like that oftentimes, which is in turn confused novices trying rebase-based workflow. There's big progress over years, and it would be nice to make it just perfect. The exact messages are: + git rebase --preserve-merges --onto upstream-master e61d4efbe4d34d64e6be50ad5009045e4ff06764 HEAD The previous cherry-pick is now empty, possibly due to conflict resolution. If you wish to commit it anyway, use: git commit --allow-empty Otherwise, please use 'git reset' # rebase in progress; onto a0b43ae # You are currently rebasing. # (all conflicts fixed: run "git rebase --continue") # nothing to commit, working directory clean Could not pick 5831bf1affad12bfa3146c37b8b622ba4e584ca3 -- Best regards, Paul mailto:pmiscml@xxxxxxxxx -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html