A couple of us routinely work from home where we don't have remote access to the office network. The merge is a critical process. It's extremely frustrating to spend hours implementing a new feature or fixing a difficult bug, then lose that work because the merge was done wrong. This article describes the policies and procedures we employ as well as some technology we've developed to help us manage our source and minimize merge errors. Who Changed What, When When you're merging changes to objects, you need to know what changed.
Comments are essential.
That's not a bad idea, and we'll revisit it later. Comments have several advantages, however. It should also tell you who made the change when. Thus, when something breaks, you can inspect the script to see what has changed since last time, and you know who to ask when you have questions.