Path: csiph.com!x330-a1.tempe.blueboxinc.net!usenet.pasdenom.info!goblin1!goblin3!goblin.stu.neva.ru!newsfeed3.funet.fi!newsfeeds.funet.fi!news.cc.tut.fi!not-for-mail
From: Anssi Saari <as@sci.fi>
Newsgroups: comp.lang.python
Subject: Re: Development tools and practices for Pythonistas
Date: Wed, 27 Apr 2011 15:13:23 +0300
Lines: 8
Message-ID: <vg37hafevto.fsf@pepper.modeemi.fi>
References: <58a6bb1b-a98e-4c4a-86ea-09e040cb2d21@r35g2000prj.googlegroups.com> <mailman.869.1303848895.9059.python-list@python.org> <877hagoa0u.fsf@benfinney.id.au> <mailman.890.1303896280.9059.python-list@python.org>
NNTP-Posting-Host: pepper.modeemi.fi
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-Trace: news.cc.tut.fi 1303906403 22231 2001:708:310:3430:203:baff:fe7d:42dd (27 Apr 2011 12:13:23 GMT)
X-Complaints-To: abuse@tut.fi
NNTP-Posting-Date: Wed, 27 Apr 2011 12:13:23 +0000 (UTC)
User-Agent: Gnus/5.101 (Gnus v5.10.10) Emacs/21.3 (usg-unix-v)
Cancel-Lock: sha1:rf68Z4g4s1ejDyTk7tC5XtOdJA4=
Xref: x330-a1.tempe.blueboxinc.net comp.lang.python:4127

Jean-Michel Pichavant <jeanmichel@sequans.com> writes:

> For a single user, there would be no merge issue.

Really? What about a single user with many computers and environments?
I find myself merging files on occasion because I edited them
separately and forgot to check in changes before doing more edits on a
different computer.