git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] doc: clarify triangular workflow

From
Matthieu Moy <matthieu.moy@univ-lyon1.fr>
Date
Dec 7, 2017, 12:43 UTC
Message-ID
<q7h9y3meoghn.fsf@orange.lip.ens-lyon.fr>
In-Reply-To
<24f652b96fd940ee91e2741830382a72@BPMBX2013-01.univ-lyon1.fr>

BENSOUSSAN--BOHM DANIEL p1507430 <daniel.bensoussan--bohm@etu.univ-lyon1.fr> writes:

Show 17 quoted lines
>>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/
Previous: Daniel BensoussanNext: Junio C Hamano
Message 5 of 12 in “doc: clarify triangular workflow”
  1. doc: clarify triangular workflowTimothee Albertin, Nov 30, 2017
  2. Junio C HamanoDec 3, 2017
  3. BENSOUSSAN--BOHM DANIEL p1507430Dec 7, 2017
  4. doc: add triangular workflowDaniel Bensoussan, Dec 14, 2017
  5. Matthieu MoyDec 7, 2017
  6. Junio C HamanoDec 7, 2017
  7. Matthieu MoyDec 14, 2017
  8. Junio C HamanoDec 14, 2017
  9. ALBERTIN TIMOTHEE p1514771Dec 15, 2017
  10. ALBERTIN TIMOTHEE p1514771Dec 15, 2017
  11. Matthieu MoyDec 15, 2017
  12. Matthieu MoyDec 15, 2017

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.