Re: [PATCH] doc: clarify triangular workflow

From: Matthieu Moy <Matthieu.Moy@univ-lyon1.fr>
To: BENSOUSSAN--BOHM DANIEL p1507430 
	<daniel.bensoussan--bohm@etu.univ-lyon1.fr>
Cc: Junio C Hamano <gitster@pobox.com>,
	ALBERTIN TIMOTHEE p1514771  <timothee.albertin@etu.univ-lyon1.fr>,
	"Michael Haggerty" <mhagger@alum.mit.edu>,
	PAYRE NATHAN p1508475 <nathan.payre@etu.univ-lyon1.fr>,
	"git\@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: [PATCH] doc: clarify triangular workflow
Date: Thu, 07 Dec 2017 13:43:48 +0100	[thread overview]
Message-ID: <q7h9y3meoghn.fsf@orange.lip.ens-lyon.fr> (raw)
In-Reply-To: <24f652b96fd940ee91e2741830382a72@BPMBX2013-01.univ-lyon1.fr> (BENSOUSSAN--BOHM DANIEL's message of "Thu, 7 Dec 2017 09:26:18 +0000")

BENSOUSSAN--BOHM DANIEL p1507430
<daniel.bensoussan--bohm@etu.univ-lyon1.fr> 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 fewer people involved.
>
>>and makes me wonder (note: I am not involved in writing any of the
>>existing text in this document) how much material foreign to the
>>actual workflow used for `git.git` should go in here.  Having
>>multiple maintainers at the same time is not a workflow element that
>>we have ever used, for example, so I am not sure about the change in
>>the above paragraph.
>
> We were told to change 'he' into 'they' to be neutral.  However, it's true
> that there's one maintainer at a time so we will remove the 's' from
> "maintainers". 

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] ..."

-- 
Matthieu Moy
https://matthieu-moy.fr/