Path: csiph.com!x330-a1.tempe.blueboxinc.net!usenet.pasdenom.info!goblin3!goblin.stu.neva.ru!newsfeed2.funet.fi!newsfeeds.funet.fi!uio.no!nntp.uib.no!svn.schaathun.net!not-for-mail From: Hans Georg Schaathun Newsgroups: comp.lang.python Subject: Re: Development tools and practices for Pythonistas Date: Fri, 29 Apr 2011 19:35:12 +0100 Organization: University of Bergen Lines: 15 Message-ID: <00dr88-846.ln1@svn.schaathun.net> References: <58a6bb1b-a98e-4c4a-86ea-09e040cb2d21@r35g2000prj.googlegroups.com> <877hagoa0u.fsf@benfinney.id.au> NNTP-Posting-Host: vannskorpion.bccs.uib.no X-Trace: toralf.uib.no 1304103239 23380 129.177.20.20 (29 Apr 2011 18:53:59 GMT) X-Complaints-To: abuse@uib.no NNTP-Posting-Date: 29 Apr 2011 18:53:59 GMT User-Agent: slrn/pre1.0.0-18 (Linux) Xref: x330-a1.tempe.blueboxinc.net comp.lang.python:4320 On Wed, 27 Apr 2011 14:24:30 +0200, Jean-Michel Pichavant wrote: : I was talking about merge *issue* i.e merge resulting in conflicts that : are not easy to solve. With a single user most of the merge will be : solved automatically by any decent VCS. Exactly, and with svn that can be a true nightmare when directories are involved. The rumour is that git handles this much better. I call it a rumour not because I doubt it (I don't), but because I have not seen for myself. -- :-- Hans Georg