Cherry Pick Multiple Commits

We always have situations where in some feature let’s call it “A” being pulled out before the ongoing release. In that case we need to manually add our code changes and push in different branch (created without having “A”).

Well the most prominent solution for this problem is cherry picking. But wait there can be catch that you might have done multiple commits.

Now to solve this problem below is the sample example being demonstrated.

Suppose below is my commit history in the faulty branch with feature “A”

Now you have created new branch without feature “A” and using below snippet you can easily merge the changes.

0396341 — represents older commit id

7220b8d — represents newer commit id

^ — represents to include the commit changes

In the final step you just need to review the changes, resolve any merge conflict and then push it in new feature branch(without feature “A”).

~Thanks for reading

Related posts:

Cuando el ser humano no soñaba con el timbre para llamar a la puerta, simplemente lo hacía con la aldaba, la misma que hoy, siglos después de su invención, muchos no saben para qué sirve o les parece…