{"thread":{"id":"47409","subject":"[PATCH] doc: reword gitworflows for neutrality","startedAt":"2017-12-08T15:18:36Z","lastAt":"2017-12-10T11:58:26Z","messageCount":3,"participants":["Daniel Bensoussan","Eric Sunshine","BENSOUSSAN--BOHM DANIEL p1507430"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"334419","messageId":"20171208151807.3569-1-daniel.bensoussan--bohm@etu.univ-lyon1.fr","threadId":"47409","inReplyTo":null,"subject":"[PATCH] doc: reword gitworflows for neutrality","fromName":"Daniel Bensoussan","fromEmail":"daniel.bensoussan--bohm@etu.univ-lyon1.fr","sentAt":"2017-12-08T15:18:07Z","receivedAt":"2017-12-08T15:18:36Z","isPatch":true,"sender":{"key":"daniel.bensoussan--bohm@etu.univ-lyon1.fr","avatar":"https://avatars.githubusercontent.com/u/49231361?v=4"},"body":"Changed 'he' to 'them' to be more neutral in \"gitworkflows.txt\".\n\nSee discussion at: https://public-inbox.org/git/xmqqvahieeqy.fsf@gitster.mtv.corp.google.com/\n\nSigned-off-by: Matthieu Moy \nSigned-off-by: Timothee Albertin \nSigned-off-by: Nathan Payre \nSigned-off-by: Daniel Bensoussan \n---\n Documentation/gitworkflows.txt | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/gitworkflows.txt b/Documentation/gitworkflows.txt\nindex 02569d0..926e044 100644\n--- a/Documentation/gitworkflows.txt\n+++ b/Documentation/gitworkflows.txt\n@@ -407,8 +407,8 @@ follows.\n `git pull `\n =====================================\n \n-Occasionally, the maintainer may get merge conflicts when he tries to\n-pull changes from downstream. In this case, he can ask downstream to\n+Occasionally, the maintainer may get merge conflicts when they try to\n+pull changes from downstream. In this case, they can ask downstream to\n do the merge and resolve the conflicts themselves (perhaps they will\n know better how to resolve them). It is one of the rare cases where\n downstream 'should' merge from upstream.\n-- \n2.11.0\n\n"},{"id":"334470","messageId":"CAPig+cTgJepi6xVn0+qP3SW0Y0g-6Nf4LvCjCkvEHfZwugY1Hg@mail.gmail.com","threadId":"47409","inReplyTo":"20171208151807.3569-1-daniel.bensoussan--bohm@etu.univ-lyon1.fr","subject":"Re: [PATCH] doc: reword gitworflows for neutrality","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2017-12-08T18:01:29Z","receivedAt":"2017-12-08T18:01:35Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"On Fri, Dec 8, 2017 at 10:18 AM, Daniel Bensoussan\n wrote:\n> doc: reword gitworflows for neutrality\n\ns/gitworflows/gitworkflows/\n\n> Changed 'he' to 'them' to be more neutral in \"gitworkflows.txt\".\n>\n> See discussion at: https://public-inbox.org/git/xmqqvahieeqy.fsf@gitster.mtv.corp.google.com/\n>\n> Signed-off-by: Matthieu Moy \n> Signed-off-by: Timothee Albertin \n> Signed-off-by: Nathan Payre \n> Signed-off-by: Daniel Bensoussan \n> ---\n> diff --git a/Documentation/gitworkflows.txt b/Documentation/gitworkflows.txt\n> @@ -407,8 +407,8 @@ follows.\n> -Occasionally, the maintainer may get merge conflicts when he tries to\n> -pull changes from downstream. In this case, he can ask downstream to\n> +Occasionally, the maintainer may get merge conflicts when they try to\n> +pull changes from downstream. In this case, they can ask downstream to\n\nAs a native English speaker, I find the new phrasing odd, and think\nthis may a step backward. How about trying a different approach? For\nexample:\n\n Occasionally, the maintainer may get merge conflicts when trying\n to pull changes from downstream. In this case, it may make sense\n to ask downstream to do the merge and resolve the conflicts\n instead (since, presumably, downstream will know better how to\n resolve them).\n\n> do the merge and resolve the conflicts themselves (perhaps they will\n> know better how to resolve them). It is one of the rare cases where\n> downstream 'should' merge from upstream.\n"},{"id":"334561","messageId":"1512907098563.90200@etu.univ-lyon1.fr","threadId":"47409","inReplyTo":"CAPig+cTgJepi6xVn0+qP3SW0Y0g-6Nf4LvCjCkvEHfZwugY1Hg@mail.gmail.com","subject":"RE: [PATCH] doc: reword gitworflows for neutrality","fromName":"BENSOUSSAN--BOHM DANIEL p1507430","fromEmail":"daniel.bensoussan--bohm@etu.univ-lyon1.fr","sentAt":"2017-12-10T11:58:18Z","receivedAt":"2017-12-10T11:58:26Z","isPatch":true,"sender":{"key":"daniel.bensoussan--bohm@etu.univ-lyon1.fr","avatar":"https://avatars.githubusercontent.com/u/49231361?v=4"},"body":">As a native English speaker, I find the new phrasing odd, and think\n>this may a step backward. How about trying a different approach? For\n>example:\n\n >Occasionally, the maintainer may get merge conflicts when trying\n >to pull changes from downstream. In this case, it may make sense\n >to ask downstream to do the merge and resolve the conflicts\n >instead (since, presumably, downstream will know better how to\n >resolve them).\n\nIndeed, this is an other possibility.\n\nThanks for the review.\n\nDaniel BENSOUSSAN-BOHM\n"}]}