[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: git apologia
From: |
Barry Warsaw |
Subject: |
Re: git apologia |
Date: |
Tue, 18 Nov 2014 11:42:32 -0500 |
On Nov 18, 2014, at 10:39 AM, Andreas Schwab wrote:
>Eli Zaretskii <address@hidden> writes:
>
>> What's more natural than asking for the Nth previous commit?
>
>In a DAG it's ambigous.
I think it's more nuanced than that. Very often in practice commits happen
linearly and in those cases, it's unambiguous. When merging in feature
branches and such, then yes, technically the multiple parents results in
ambiguity. Even so, a first-parent default would in practice usually give you
the answer you want. You can almost always ignore the details of the merge
(of course, with command line overrides for when you need to delve deeper).
Bazaar uses a first-parent default because it promotes a "main line of
development" work flow, which is almost always what you (well, *I* :) want.
Cheers,
-Barry
signature.asc
Description: PGP signature
- Re: git apologia, (continued)
- Re: git apologia, David Kastrup, 2014/11/17
- Re: git apologia, Achim Gratz, 2014/11/17
- Re: git apologia, Yuri Khan, 2014/11/17
- Re: git apologia, Thien-Thi Nguyen, 2014/11/18
- Re: git apologia, John Yates, 2014/11/18
- Re: git apologia, Thien-Thi Nguyen, 2014/11/18
- Re: git apologia, Andreas Schwab, 2014/11/18
- Re: git apologia,
Barry Warsaw <=
- Re: git pull fails with merge conflicts. How can this possibly happen?, Sergey Organov, 2014/11/17
- Re: git pull fails with merge conflicts. How can this possibly happen?, Eli Zaretskii, 2014/11/17
- Re: git pull fails with merge conflicts. How can this possibly happen?, David Kastrup, 2014/11/17
- Re: git pull fails with merge conflicts. How can this possibly happen?, Sergey Organov, 2014/11/17
- Re: git pull fails with merge conflicts. How can this possibly happen?, Glenn Morris, 2014/11/17
- Re: git pull fails with merge conflicts. How can this possibly happen?, Alan Mackenzie, 2014/11/18
- Re: git pull fails with merge conflicts. How can this possibly happen?, David Kastrup, 2014/11/15
- Re: git pull fails with merge conflicts. How can this possibly happen?, Stephen J. Turnbull, 2014/11/15