Concept Map: git merge and rebase

May 1, 2014 • Florian Rathgeber

A concept map showing the differences between git merge and git rebase for integrating a diverged local branch with an upstream branch. This would be suitable for someone already familiar with basic Git concepts.