Source control is a fantastic tool, but when it’s new, it can be confusing. This month on SocialBizUg.org, I talk about merging.
This month I’m going to talk about merging. You write your code. You commit your code. You pull code from other developers and you merge it. Ideally, you’ve communicated with your fellow developers and the merge just … well, merges. There was nothing overlapping and it all merges together and you can push up the merged code. Great. But what do you do when that doesn’t happen? What do you do when it all conflicts?