Marcus Quettan
Nov 23, 2020

--

Hey Alberto! Thank you for the response. I agree that rebase is a wonderful command to allow for team members to resolve merge conflicts with the master branch prior to their pull request. However, git merge does the exact same thing without forcing a re-write of history.

git rebase's only advantage over git merge is that it serves to create/preserve a linear history on the destination branch. This is an entirely personal preference. I prefer a true history as opposed to a linear history.

--

--

Marcus Quettan
Marcus Quettan

Written by Marcus Quettan

Research Engineer — Bored Millennial

No responses yet