Chris Angelico <ros...@gmail.com>:
> On Sun, Jan 3, 2016 at 1:26 AM, Marko Rauhamaa <ma...@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
--
https://mail.python.org/mailman/listinfo/python-list
