Question

Ok so I Have a branch in git that looks like this

A-B-C-D-E

and a branch that looks like this

A-B-F-G

I want to make a branch like this

A-B-D-E-F-G

I think tagging might be involved but I am rather new to git.

Answer 1

You may want to create a new branch, starting at commit B, and then cherry-pick the specific commits you’re interested in onto your new branch.

git checkout my-branch <B-commit-id>

git cherry-pick <D-commit-id>
git cherry-pick <E-commit-id>
git cherry-pick <F-commit-id>
git cherry-pick <G-commit-id>