git merge vs rebase — Which one to use When

The perks of merge and rebase

git merge and git rebase are excellent tools for integrating changes from one branch into another. But there is often a confusion about which one to use when.

NOTE: This can be understood better if all the commit histories in the diagrams are thoroughly followed. It will take a little more time but I am sure this will clear out all the confusions that we have about rebase and merge.

For this, we will follow an integrated approach. This post is a little comprehensive and along…