Git Cherry-Pick
Classic Branching
Classic Branching
Tracing
Squashing
Problems!
Problems!
Rebase?
Cherry Pick!
>replay changes, don't change commit parent<
(master) /$ git checkout -b CLOUD-2-rebased
(CLOUD-2-rebased) /$ git cherry-pick 5
<or>
(CLOUD-2-rebased) /$ git cherry-pick 5^..9
a
Cherry Pick!
(C1) /$ git checkout -b C2-rebased
(C2-rebased) /$ git cherry-pick 5
a
Cherry Pick!
- You can go overboard if you cherry pick other people's WIP branches into your branch
- Traceability and conflicts galor