Git rebase vs merge - there can be only one.
Introduction
Rebase vs merge, which is better? There are a lot of online discussions about these two “workflows”. One is pro-rebasing and the other swears by merging. Both sides are stuck in their own thinking and both think they are right. So which is it? In my opinion: neither or both. Before you get defensive, hear me out. I’ll try to explain this in the following post.
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.
.... read more ....See all Article posts