Git is the standard source code repository manager for open source projects and many closed source projects. This article shows new Git users how to do something slightly advanced but fundamental to its purpose: resolving a git-merge conflict.
https://opensource.com/article/20/4/git-merge-conflict
https://opensource.com/article/20/4/git-merge-conflict