Thanks for the help guys. I think I ended up doing what gaeorn suggested. The problem was trying to do it all server side.
I checked out the official code, copied it over to my working copy, committed that, then made a branch. Now I do my work on one branch and copy over the official code as necessary to another, then merge them.
|