Development tools and practices for Pythonistas
jeanmichel at sequans.com
Wed Apr 27 14:24:30 CEST 2011
Anssi Saari wrote:
> Jean-Michel Pichavant <jeanmichel at 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.
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.
More information about the Python-list