layout title post Working on merge conflicts in Git Conflict Resolution, a Primer: By Jono Bacon Resolving Merge Conflicts Video from Coursera on Resolving Merge Conflicts A successful git branching model Stack Exchange: Optimal Workflow Model