Unmerge a git branch, keeping post-merge commits

Question

Say there are two branches master and branchA.

I work on master, a friend on branchA. Once things are finalized, we merge branchA with master.

After several commits on the merged master, the client wants the work done on branchA removed, but NOT the commits done after the merge.

How can we do it?

Justin ᚅᚔᚈᚄᚒᚔ · Accepted Answer · 2018-10-10 13:31:26Z

78

Basically, you git revert the merge commit:

git revert -m 1 hash_of_merge_commit

You may end up with some conflicts that you'll have to manually unmerge, just like when merging normally.

Additional links:

answered Jan 31, 2012 at 0:48

15.4k8 gold badges55 silver badges64 bronze badges

Sign up to request clarification or add additional context in comments.

4 Comments

please re-read the question, if possible give an objective answer.

Please re-read the answer, and the article linked. It explains, objectively, how to do exactly what you're trying to do.

@Justinᚅᚔᚈᚄᚒᚔ sounds like useful intel but the links are all broken; do you have a newer version of that Undoing Mergest post?