Cherry Picking

Cherry Pick

The diagram above describes the cherry picking procedure by taking the b2 commit specifically from the green branch and putting it on top of the red branch. Thus a new cherry pick commit is created that contains everything from C2 and B2 respectively. Conflicts have to be resolved in case they exist.  After the cherry pick the man who works on the red branch has all the differences that b2 offers.