#rebase-vs-merge

Gotcha, Git!

We've all pulled our hairs out at some point due to Git's confusing intricacies. One such scenario could be when you see the dreaded message - "Your branch and X branch have diverged ....". You would neither be able to pull nor push and ARGH it's fru...