If you've ever pulled the latest changes, watched Git print CONFLICT (content): Merge conflict in, and felt your stomach drop — you're not alone, and it's not actually bad news. A merge conflict means two branches changed the same par...