GitHub repository: tiredsoldier/first-git-conflict
Primary language: HTML
Description: A simple repository to teach students how to handle their first git merge conflict.