Subversion conflicts (a better way?)

The formal way to deal with this is to use TortoiseMerge. Selects blobs of red where conflicts exist and right-click to pick options such as "Use this text block" or "Use text block from 'mine' before 'theirs'" and when all of the red is cleaned up click "Save" at the upper left and then say OK to "Mark as resolved" to finish up. Every line in every swath of red needs to be accounted for, even empty spaces, so you will want to drag a selection over the whole of red area before dealing with it.