How to copy commits from one branch to another

Question

I have two features I\'m working on

Shared -- Commits -- A -- B -- C Feat1

Shared -- Commits -- D -- E -- F Feat2

The problem is that to test Feat2 I rea

Answer 1

There are basically two options here.

1. You can use cherry-pick to copy the new commits on feat2 to combo.
2. Instead of rebasing, you can merge

Cherry Picking

To cherry pick new commits on feat2 to combo, run the following:

git checkout combo
git cherry-pick   

Merging

Or alternately, you can merge instead of rebasing. E.g. To create combo:

git checkout -b combo feat1
git merge feat2

Then, to "merge in new changes" from feat2, just...

git merge feat2

Likewise, to merge in new commits on feat1:

git merge feat1