git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: BENSOUSSAN--BOHM DANIEL p1507430  <daniel.bensoussan--bohm@etu.univ-lyon1.fr>
To: Eric Sunshine <sunshine@sunshineco.com>
Cc: Git List <git@vger.kernel.org>,
	MOY MATTHIEU <matthieu.moy@univ-lyon1.fr>,
	ALBERTIN TIMOTHEE p1514771  <timothee.albertin@etu.univ-lyon1.fr>,
	"PAYRE NATHAN p1508475" <nathan.payre@etu.univ-lyon1.fr>
Subject: RE: [PATCH] doc: reword gitworflows for neutrality
Date: Sun, 10 Dec 2017 11:58:18 +0000	[thread overview]
Message-ID: <1512907098563.90200@etu.univ-lyon1.fr> (raw)
In-Reply-To: <CAPig+cTgJepi6xVn0+qP3SW0Y0g-6Nf4LvCjCkvEHfZwugY1Hg@mail.gmail.com>

>As a native English speaker, I find the new phrasing odd, and think
>this may a step backward. How about trying a different approach? For
>example:

    >Occasionally, the maintainer may get merge conflicts when trying
    >to pull changes from downstream. In this case, it may make sense
    >to ask downstream to do the merge and resolve the conflicts
    >instead (since, presumably, downstream will know better how to
    >resolve them).

Indeed, this is an other possibility.

Thanks for the review.

Daniel BENSOUSSAN-BOHM

      reply	other threads:[~2017-12-10 11:58 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-12-08 15:18 [PATCH] doc: reword gitworflows for neutrality Daniel Bensoussan
2017-12-08 18:01 ` Eric Sunshine
2017-12-10 11:58   ` BENSOUSSAN--BOHM DANIEL p1507430 [this message]

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=1512907098563.90200@etu.univ-lyon1.fr \
    --to=daniel.bensoussan--bohm@etu.univ-lyon1.fr \
    --cc=git@vger.kernel.org \
    --cc=matthieu.moy@univ-lyon1.fr \
    --cc=nathan.payre@etu.univ-lyon1.fr \
    --cc=sunshine@sunshineco.com \
    --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).