GitHub repository: r-ash/git-example-merge-conflics
Created: 2020-01-21T12:12:04Z
Description: An example repo with merge conflicts