Git: Handling and Avoiding Conflicts in Git A well documented article covering the topic of handling conflicts in Git External Link http://weblog.masukomi.org/2008/07/12/handling-and-avoiding-conflicts-in-git