[Tilesathome] SVN merging help required

[spaetz]

On Fri, Aug 29, 2008 at 10:58:56AM +0200, Florian Lohoff wrote:
> 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 ;(

It's less svn's fault rather than my inexperience with branches and merging. But I'm getting there :-)

> 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 ...

I do use mercurial (hg) for all my other (and local) uses. It is basically git in python. I would appreciate it if OSM would offer a (kind of) central hg repository ;-) )


spaetz