GitHub repository: juanpescador/merge-conflict-resolution
Primary language: C#
Created: 2018-04-19T14:27:48Z
Description: Merge conflict resolution example