GIT Demystifying part 16, Cherry-pick 🍒👌 vs Merge

 GIT Demystifying part 16

 Cherry-pick 🍒👌 vs Merge

working tree for this lab. from part 15.

The mail idea is develop a tree of a software product where has tree versions, that has common features from the begining, then air, water, fire, and ground, reach his develop. and the master continue his develop. and each new feature, has developed in a new branch. the exclusive feature never will be incorporated to the air, water, fire and ground, but the mature evolve of the master can be incorporated to the four element branches.

2 The Merge Way

3

merged the new master basic features to exclusive feature.

Now create again the branch exclusiveFeature to continue evolving this branch leaving apart the evolution of master.

same view with gitk

The Cherry-Pick Way

Let´s take the tree again from the backup to start with the Cherry-pick. and move to the exclusiveFeature commit to incorporate to it the last changes from master, and leave master out from the exclusiveFeature. 

now look like

Now let´s cherry-pick the latest changes from master.

Opps, we need to point the branch exclusiveFeature to HEAD or 7db55f6 in order to evolve the branch exclusiveFeature in future, it will be doing manually.

Now we have the master branch appart of the exclusiveFeature evolution, and exlusiveFeature with the latest change of master. Notice that in opposite with the merge way, it is not a join in the graph.

same view with gitk

eot