Path: csiph.com!eternal-september.org!feeder.eternal-september.org!mx02.eternal-september.org!.POSTED!not-for-mail
From: Marko Rauhamaa <marko@pacujo.net>
Newsgroups: comp.lang.python
Subject: Re: We will be moving to GitHub
Date: Sat, 02 Jan 2016 16:52:15 +0200
Organization: A noiseless patient Spider
Lines: 38
Message-ID: <87a8oo11b4.fsf@elektro.pacujo.net>
References: <n66kmg$ig$1@ger.gmane.org> <CAPTjJmq1Qevy7h4pqrQPobLRO-_ooLrXsZhK9Z9YCKPyFnxKsQ@mail.gmail.com> <CAKJDb-MFM6i+MMZXcPkV6x-rFnKr9Yxt4f3ne1dF3dk_SkoFpw@mail.gmail.com> <mailman.146.1451678991.11925.python-list@python.org> <5687718d$0$1612$c3e8da3$5496439d@news.astraweb.com> <87oad41fd4.fsf@elektro.pacujo.net> <mailman.158.1451730569.11925.python-list@python.org> <87k2ns1b0d.fsf@elektro.pacujo.net> <mailman.159.1451734854.11925.python-list@python.org> <87ege012i5.fsf@elektro.pacujo.net> <mailman.165.1451745521.11925.python-list@python.org>
Mime-Version: 1.0
Content-Type: text/plain
Injection-Info: mx02.eternal-september.org; posting-host="b7cb1518d23ec19d482dcc9c31d30fdd"; logging-data="9637"; mail-complaints-to="abuse@eternal-september.org";	posting-account="U2FsdGVkX19t3ozWrV0OurDoNHmnPBV+"
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux)
Cancel-Lock: sha1:Ju/MSsaGrRnRLfMphLr+4Y4g6fw= sha1:F1JacVPP4fAJicYrsYQQ/ipTVN4=
Xref: csiph.com comp.lang.python:101149

Chris Angelico <rosuav@gmail.com>:

> On Sun, Jan 3, 2016 at 1:26 AM, Marko Rauhamaa <marko@pacujo.net> wrote:
>> A conflict is when there have been two parallel changes to the same
>> versioned target. In the case of Hg and Git, the whole repo is the
>> target.
>
> No, that's just a merge.
>
> https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging

Terminology aside, if I do this with Git:

       -----+--------------------+-------->
             \                   ^
              \pull             /push
               v               /
               +--------------+
                     edit

everything goes in without any further ado.

However, this operation will be blocked by Git:


       --+--+--------------------+----+--->
          \  \                   ^    X
           \  \pull             /push/
            \  v               /    /
         pull\ +--------------+    /push
              \      edit         /
               v                 /
               +-----------------+

Not so by Teamware as long as the pushes don't have files in common.


Marko