-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Michael 'Mickey' Lauer schreef: > Just do the changes manually. > > svn update shouldn't override, but rather merge changes together with > yours, so you're relatively safe.
Heh, I wouldn't call 'inline conflict markers' safe -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (Darwin) iD8DBQFGe21CMkyGM64RGpERAgjmAJ99WUJLW8lhAKSlvfahKAWTOvLAqQCgmkXP Lg3B4PEC+EQmTAOnKwhLs+c= =gpKN -----END PGP SIGNATURE-----
