GitHub repository: lennycampino/merge-conflict-py
Primary language: Python
Description: Merge conflict example for Git workshop