Accidentially forgot to switch branch, how to unmerge branches?

Question

I have three branches main A, B and C accidentally started from B.

A1----------A
 \
--Bn
   \
   C0-------Cn

C starts where B ends, A just merged into B. And I want it to be like:

-Bn
 /
A1----------An
 \
 C0-------Cn

C starts from A. I mean changes made by B should not be in C. What can I do?

Both branch diagrams actually look the same to me. Can you edit your question and point out what you want? — Tim Biegeleisen, Jan 28 '20 at 16:46
Have a look at git cherry pick - https://www.atlassian.com/git/tutorials/cherry-pick. You want to apply commit C to branch A and then revert commit C from branch B — auburg, Jan 28 '20 at 16:57

score 0 · Accepted Answer · answered Jan 28 '20 at 17:21

0

Edit.

I see your edited question. Now I understand you better.

You have to create a new branch from A1 and then cherry-pick all commits from branch C

Remove old branch C.

answered Jan 28 '20 at 17:21

lapwingg

1 Answers1