Dealing with Conflicts in Git
Something that I didn’t find immediately obvious was how to deal with conflicts in Git, so here’s a quick tutorial. Conflicts arise when two different branches are working on the same file and then try to commit changes. Conflicts don’t have to be catastrophic, it simply depends on what’s happend with the file.