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/
next prev parent reply other threads:[~2017-12-07 12:44 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-30 9:42 [PATCH] doc: clarify triangular workflow Timothee Albertin
2017-12-03 6:36 ` Junio C Hamano
2017-12-07 9:26 ` BENSOUSSAN--BOHM DANIEL p1507430
[not found] ` <24f652b96fd940ee91e2741830382a72@BPMBX2013-01.univ-lyon1.fr>
2017-12-07 12:43 ` Matthieu Moy [this message]
2017-12-07 15:31 ` Junio C Hamano
2017-12-14 10:48 ` [PATCH v2] doc: add " Daniel Bensoussan
[not found] ` <9a0556ac403845f39a564bbc55df5b3a@BPMBX2013-01.univ-lyon1.fr>
2017-12-14 15:04 ` Matthieu Moy
2017-12-14 20:47 ` Junio C Hamano
2017-12-15 15:46 ` ALBERTIN TIMOTHEE p1514771
[not found] ` <eca47dd3598045a1a3fac94f9df8e972@BPMBX2013-01.univ-lyon1.fr>
2017-12-15 16:04 ` Matthieu Moy
2017-12-15 15:18 ` ALBERTIN TIMOTHEE p1514771
[not found] ` <130319f3e40c4bfb81d2fc37bb4a4f9f@BPMBX2013-01.univ-lyon1.fr>
2017-12-15 15:54 ` Matthieu Moy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=q7h9y3meoghn.fsf@orange.lip.ens-lyon.fr \
--to=matthieu.moy@univ-lyon1.fr \
--cc=daniel.bensoussan--bohm@etu.univ-lyon1.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=mhagger@alum.mit.edu \
--cc=nathan.payre@etu.univ-lyon1.fr \
--cc=timothee.albertin@etu.univ-lyon1.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).