GitHub repository: DanielFerguson/MergeConflicts
Created: 2018-03-22T08:29:51Z
Description: A tutorial of how to deal with merge conflicts.