[Tilesathome] SVN merging help required

[Florian Lohoff]

On Fri, Aug 29, 2008 at 10:53:29AM +0200, spaetz wrote:
> Bahh, I  know again why I didn't do branches.

I'm sorry ;(

> I don't want to risk losing half of the changes and end up with a
> broken client because of that.

Diff it and keep the diff :) Might loose the history but not the hard
work.

> /me hating cvs tools. All of them

Have a look at git - I dont like cvs and svn although i use them
occasionally at work. git just blew me away with speed and easy of use ...

Flo
-- 
Florian Lohoff                  flo at rfc822.org             +49-171-2280134
	Those who would give up a little freedom to get a little 
          security shall soon have neither - Benjamin Franklin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <http://lists.openstreetmap.org/pipermail/tilesathome/attachments/20080829/e370e7fe/attachment.pgp>