I had upgraded to Ubuntu server开发者_开发问答 10.04 - however it removed SVK which I had been using for distributed-vc needs, as much of my old projects were still wrapped up in self-hosted subversio
Some complex subversion merges are coming up in my project: big branches that have been apart for a long time. Svn gives too many conflicts - and some of them seem spurious.
I have to make local changes to my project files in order to get it to run in a different environment.Twice now I accidentally checked those changes in (and messed up everyone else\'s running environm