Re: [PATCH] doc: clarify triangular workflow

2017-12-07 Thread Junio C Hamano
Matthieu Moy writes: > Not a native speaker, but according to wikipedia > (https://en.wikipedia.org/wiki/Singular_they) it's OK to write > "maintainer [singular, but already neulral] may get merge conflicts when > they [sinugular they] ..." Yes.

Re: [PATCH] doc: clarify triangular workflow

2017-12-07 Thread Matthieu Moy
BENSOUSSAN--BOHM DANIEL p1507430 writes: >>The document starts with > > >This document attempts to write down and motivate some of the > >workflow elements used for `git.git` itself. Many ideas apply > >in general, though the full workflow is rarely required for > >smaller projects with

RE: [PATCH] doc: clarify triangular workflow

2017-12-07 Thread BENSOUSSAN--BOHM DANIEL p1507430
>The document starts with >This document attempts to write down and motivate some of the >workflow elements used for `git.git` itself. Many ideas apply >in general, though the full workflow is rarely required for >smaller projects with fewer people involved. >and makes me wonder (note: I

Re: [PATCH] doc: clarify triangular workflow

2017-12-02 Thread Junio C Hamano
Timothee Albertin writes: > diff --git a/Documentation/gitworkflows.txt b/Documentation/gitworkflows.txt > index 02569d0..21f6dc8 100644 > --- a/Documentation/gitworkflows.txt > +++ b/Documentation/gitworkflows.txt > @@ -407,8 +407,8 @@ follows. > `git pull ` >

[PATCH] doc: clarify triangular workflow

2017-11-30 Thread Timothee Albertin
Changed the documentation about the triangular workflow because it was not clear enough for a new contributor. With a clearer and more precise documentation, any new Git contributors will spend less time on understanding this doc and the way Git works. Based-on-patch-by: Jordan DE GEA Signed-off