Conflict This is a repository with nice git merge & rebase exercises. :) Credits Originally made for the Software Engineering course at the University of Tübingen. How To Use Go to ./website/ to see the current state of the internal website.