A common cause for headaches when dealing with version control is the process of merging a branch of code back into the trunk. As a brief primer, software developers will use version control systems ...