[Tilesathome] SVN merging help required

[Carsten Möller]

spaetz schrieb:
> 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
> 
Hey guys, SVN is the defacto standard! And after having seen a lot of 
version control systems I must say it's definitely the best of all.
In our company I have to manage the production line (about 500 source 
files) for one product with 5 custom branches, trunk and maintenance on 
each, several releases and of course several feature branches.
The complete build mechanism based on svn.
Branching tagging merging is my dayly bread and with just a little 
experience it's easier then a tire change!