Choosing between git rebase and git merge remains one of the most discussed topics in the community....