From: BENSOUSSAN--BOHM DANIEL p1507430 <daniel.bensoussan--bohm@etu.univ-lyon1.fr>
Date: Sun, 10 Dec 2017 11:58:18 GMT
Subject: RE: [PATCH] doc: reword gitworflows for neutrality
Message-ID: <1512907098563.90200@etu.univ-lyon1.fr>
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