{"thread":{"id":"35184","subject":"Rebasing merge commit fails during --preserve-merges when ancestor merge is deleted","startedAt":"2013-10-23T19:25:57Z","lastAt":"2013-10-23T19:25:57Z","messageCount":1,"participants":["John Feminella"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"229364","messageId":"CAAcFwk5Vd2+SJWQaos9o9UX1Za1yV=oEUWCj1VmD87BQP0u6Fw@mail.gmail.com","threadId":"35184","inReplyTo":null,"subject":"Rebasing merge commit fails during --preserve-merges when ancestor merge is deleted","fromName":"John Feminella","fromEmail":"jxf@jxf.me","sentAt":"2013-10-23T19:25:57Z","receivedAt":"2013-10-23T19:25:57Z","isPatch":false,"sender":{"key":"jxf@jxf.me","avatar":null},"body":"I have this situation and an accompanying sample repository\nreproducing the issue:\n\nhttps://gist.github.com/fj/7124501/raw/8d37058c1452379d0ae58bd87b0b9e0380bd80b2/gistfile1.txt\n\n* I would like to rebase and delete a spurious ancestor merge commit\n(bbd8966 in the example).\n\n* When I do that, however, a successor merge commit (97ba1d7) that has\nthe ancestor merge commit (bbd8966) fails with the noted error:\n\n=====\nerror: Commit 97ba1d761f60b901f56766886da4ed678e56abea is a merge but\nno -m option was given. fatal: cherry-pick failed Could not pick\n97ba1d761f60b901f56766886da4ed678e56abea\n=====\nThe expected result for me is that a new merge commit that merges\n6b8c765 (which now occupies the topological spot of the previous\nspurious commit, bbd8966) and 11d8b92.\n\nWhat am I doing wrong here? Is there a way to fix multiple instances\nof this in a history without doing tedious cherry-picking?\n\nThanks!\n\n~ jf\n"}]}