From: ALBERTIN TIMOTHEE p1514771 <timothee.albertin@etu.univ-lyon1.fr>
To: "Martin Ågren" <martin.agren@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>,
"danielbensoussanbohm@gmail.com" <danielbensoussanbohm@gmail.com>,
PAYRE NATHAN p1508475 <nathan.payre@etu.univ-lyon1.fr>,
MOY MATTHIEU <matthieu.moy@univ-lyon1.fr>
Subject: RE: [PATCH 1/2] Documentation about triangular workflow
Date: Wed, 22 Nov 2017 15:13:17 +0000 [thread overview]
Message-ID: <1511367199220.88867@etu.univ-lyon1.fr> (raw)
In-Reply-To: <CAN0heSoLbnkfJLqStvR2nfy4LAAc3KEkRH-_kE-QAQoM-4iqGA@mail.gmail.com>
>On 17 November 2017 at 17:07, Daniel Bensoussan
><danielbensoussanbohm@gmail.com> wrote:
>> +- If the maintainer accepts the changes, he merges them into the
>> + **UPSTREAM** repository.
>Personally, I would prefer "they" and "their" over "he" and "his". I'm
>not sure how universal this preference is, but see also 715a51bcaf (am:
>counteract gender bias, 2016-07-08). I realize that "he" is already used
>in this document...
This could be a good thing in order to be neutral. We can change this in
the whole file.
>> + ... The contributor
>> +was forced to create a mail which shows the difference between the
>> +new and the old code, and then send it to a maintainer to commit
>> +and push it. This isn't convenient at all, neither for the
>> +contributor, neither for the maintainer.
>"neither ... nor". That said, I find the tone of this paragraph a bit
>value-loaded ("forced ... isn't convenient at all"). It does sort of
>contradict or at least compare interestingly with how git.git itself is
>maintained. ;-) Maybe this could be framed in a more neutral way?
Junio C Hamano told us the same thing about the motivation
section, we'll change it the next patch.
>> +The goal of the triangular workflow is also that the rest of the
>> +community or the company can review the code before it's in production.
>> +Everyone can read on **PUBLISH** so everyone can review code
>> +before the maintainer(s) merge it to **UPSTREAM**. It also means
>I think you can drop the "(s)". Your example workflow could have a
>single maintainer. In a multi-maintainer workflow, the workflow would
>still be the same. So no need to cover all bases by sprinkling "(s)" on
>the text. (IMHO.)
We'll fix that.
Thank you for your review.
Timothée Albertin
next prev parent reply other threads:[~2017-11-22 15:13 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-17 16:07 [PATCH 1/2] Documentation about triangular workflow Daniel Bensoussan
2017-11-17 16:07 ` [PATCH 2/2] Triangular workflow Daniel Bensoussan
2017-11-17 21:15 ` Martin Ågren
2017-11-17 20:01 ` [PATCH 1/2] Documentation about triangular workflow Stefan Beller
2017-11-17 21:11 ` Martin Ågren
2017-11-22 15:13 ` ALBERTIN TIMOTHEE p1514771 [this message]
2017-11-18 1:33 ` Junio C Hamano
2017-11-22 15:55 ` ALBERTIN TIMOTHEE p1514771
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=1511367199220.88867@etu.univ-lyon1.fr \
--to=timothee.albertin@etu.univ-lyon1.fr \
--cc=danielbensoussanbohm@gmail.com \
--cc=git@vger.kernel.org \
--cc=martin.agren@gmail.com \
--cc=matthieu.moy@univ-lyon1.fr \
--cc=nathan.payre@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).