From: Simon Vandyk Sent: Friday, November 25, 2016 4:47 PM
I know its a mouthful of a subject line, but I've come across this situation quite a few times now, and after searching everywhere for an answer without any luck i have finally perked up the courage to ask you guys. So to elaborate on the subject line, how can i revert a 'merge' commit with some bad conflict resolutions in and then re-merge it in, I have tried reverting the merge commit then reverting the revert and merging back in again, but it does not ask me to resolve any conflicts the second time round, i essentially want to re-do the conflict resolution part. Is there any way to do this without cherry picking etc? -- Is this merge commit some way back in history, or are you catching the mistake immediately? If it is the latter, then just reset the current branch to just before the merge (first parent), and then redo the merge. The side branch should still be at the point just before the merge. Is the problem 'bigger' i.e. simply that there are too many conflict/changes to fix-up in one go and get them all right? Philip -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
