How do you manage code changes?

[ericand]

That is what we do for the most part. The merge is made much easier by
using a contextual diff tool that visually shows which files are different, and
helps us merge the files.

Originally Posted by Donut

We use a set of folders with different version names, and a good old USB drive. My job this year (other than doing a few tasks that had to be finished) was pretty much merging code and making sure everything got coded.

We should probably invest in something else though.