GitHub repository: y33les/merge-tut
Description: Git conflict resolution tutorial