GIT: merge vs rebase

dzone

rebase for dummies

While merging and rebasing are similar in Git, they serve two different functions. Here’s what you should know to keep your histories as clean or as complete as you like.

The git rebase command has a reputation for being magical Git voodoo that beginners should stay away from, but it can actually make life much easier for a development team when used with care. In this article, we’ll compare git rebase with the related git merge command and identify all of the potential opportunities to incorporate rebasing into the typical Git workflow.

pdf