Hey guys, a (hopefully) quick question for everyone. We're trying to revise our tragic deployment system right now to something more sane, and a bit of a debate arose earlier about the best way to do ...

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 ...