On Tue, Sep 24, 2013 at 10:56:48PM +0300, Paul Sokolovsky wrote: > 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 I'm interested in solving this, but I can't seem to reproduce it with the following script. Can you provide more information about which branches specifically you were using (as well as which git version) so I can reproduce the problem and look into fixing it? git checkout -b test-base printf "line 1\n" >example git add example git commit -m "add line 1" git checkout -b to-rebase chmod 755 example git add example git commit -m "change permissions" git checkout test-base printf "line 2\n" >>example git add example git commit -m "add line" git checkout to-rebase git rebase test-base test -x example -- brian m. carlson / brian with sandals: Houston, Texas, US +1 832 623 2791 | http://www.crustytoothpaste.net/~bmc | My opinion only OpenPGP: RSA v4 4096b: 88AC E9B2 9196 305B A994 7552 F1BA 225C 0223 B187
Attachment:
signature.asc
Description: Digital signature