Path: csiph.com!fu-berlin.de!uni-berlin.de!not-for-mail
From: Chris Angelico <rosuav@gmail.com>
Newsgroups: comp.lang.python
Subject: Re: We will be moving to GitHub
Date: Sun, 3 Jan 2016 01:38:32 +1100
Lines: 15
Message-ID: <mailman.165.1451745521.11925.python-list@python.org>
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>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Trace: news.uni-berlin.de emhQDyUc216h4BzGtlKgAwQejLr/VisSw3np4edXfLwA==
Return-Path: <rosuav@gmail.com>
X-Original-To: python-list@python.org
Delivered-To: python-list@mail.python.org
X-Spam-Status: OK 0.012
X-Spam-Evidence: '*H*': 0.98; '*S*': 0.00; 'received:209.85.223': 0.03; 'cc:addr:python-list': 0.09; 'jan': 0.11; '2016': 0.16; 'from:addr:rosuav': 0.16; 'from:name:chris angelico': 0.16; 'received:io': 0.16; 'received:psf.io': 0.16; 'repo': 0.16; 'wrote:': 0.16; 'merge': 0.18; 'changes': 0.20; 'cc:2**0': 0.20; 'cc:addr:python.org': 0.20; 'am,': 0.23; 'header:In-Reply-To:1': 0.24; 'chris': 0.26; 'message-id:@mail.gmail.com': 0.27; 'then.': 0.27; 'received:google.com': 0.35; 'there': 0.36; 'received:209.85': 0.36; 'subject:: ': 0.37; 'two': 0.37; 'no,': 0.38; 'received:209': 0.38; 'url:en': 0.39; 'chrisa': 0.84; 'url:book': 0.84; 'url:v2': 0.84; 'to:none': 0.91
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:cc :content-type; bh=zYXljdAw0g7ohc1L94d/lSU4DTijRw+TTuEblFHq4Yc=; b=OjJYov4bCiHDAe2GjLshTK72LY2tUjBXKHPuSKCdX8pTzIafLssG4BOc/OWIP7yBBk oa94hQdTY9HK6SCfBNHbt73sZ3aXEB1Or5qt/MGCeGCCWuUunOuVaepBQGGR+/bAiGsK wSxLY09sOUKdyOq/bVuhEhdiMWC4Pf5hCFCRNPPCuxOfqG3xGYcG6lZaAkxm+86LVOB7 CkFdZ8DBGHTejdaCloi1JEqLBpeQUxIKzPysXvGSdJrt/YhKYPgFdMzCAkve9BB+DZwN Yzz7cm5RnzCBD67Srf05uwmHrbRSTLIYjCB5DVTg9jReZ9ngouu77Qr/YiMJFHHJudyn iDzg==
X-Received: by 10.107.14.73 with SMTP id 70mr42911186ioo.31.1451745512800; Sat, 02 Jan 2016 06:38:32 -0800 (PST)
In-Reply-To: <87ege012i5.fsf@elektro.pacujo.net>
X-BeenThere: python-list@python.org
X-Mailman-Version: 2.1.20+
Precedence: list
List-Id: General discussion list for the Python programming language <python-list.python.org>
List-Unsubscribe: <https://mail.python.org/mailman/options/python-list>, <mailto:python-list-request@python.org?subject=unsubscribe>
List-Archive: <http://mail.python.org/pipermail/python-list/>
List-Post: <mailto:python-list@python.org>
List-Help: <mailto:python-list-request@python.org?subject=help>
List-Subscribe: <https://mail.python.org/mailman/listinfo/python-list>, <mailto:python-list-request@python.org?subject=subscribe>
Xref: csiph.com comp.lang.python:101148

On Sun, Jan 3, 2016 at 1:26 AM, Marko Rauhamaa <marko@pacujo.net> wrote:
> Chris Angelico <rosuav@gmail.com>:
>
>> I don't think you understand the meaning of "merge conflict", then. A
>> merge conflict is when you cannot simply merge the changes.
>
> 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

ChrisA