I'm one student who has had to merge changes from trunk back to my private branch. I had to do a couple of these operations recently, and it involved more than 1500 file updates in a week time frame. Of course, since most of the codebase was similar, I only had to cater for the area of code I had ch...