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? Regards. Simon. -- *THIS E-MAIL AND ANY ATTACHED FILES ARE CONFIDENTIAL AND MAY BE LEGALLY PRIVILEGED.*If you are not the addressee, any disclosure, reproduction, distribution or other use of this communication is strictly prohibited. If you have received this transmission in error please notify the sender immediately and then delete this e-mail. Any personal opinions or statements contained in this e-mail are not authorised or endorsed by Totally Communications or any of its subsidiaries. Totally Communications is not liable for any viruses associated with this transmission. -- 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.
