>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
