Git: Handling and Avoiding Conflicts in Git A well documented article covering the topic of handling conflicts in Git