Git rebase vs merge - there can be only one.

TL;DR Rebase is a tool used while developing. Merging is a tool used for incorporating your branch into a target branch. Both tools or workflows serve each other in the end. Introduction There are a lot of online discussions about these two &ldquo;workflows&rdquo;. One is pro-rebasing and the other swears by merging. Both sides are stuck in their own thinking and both think they are right. Follow…