GitHub repository: mercutiodesign/merge-conflict-py
Primary language: Python
Created: 2020-02-26T10:22:31Z
Description: Merge conflict example for Git workshop