diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-12-27 11:16:25 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-12-27 11:16:25 -0800 |
| commit | f7bbca1cae80657f0ff782e7ccace810e9e723f8 (patch) | |
| tree | 54800c406be724fbf48e82e93a2f136ec15bce9f /Documentation/gitworkflows.txt | |
| parent | Merge branch 'ks/branch-cleanup' (diff) | |
| parent | doc: reword gitworkflows.txt for neutrality (diff) | |
| download | tgif-f7bbca1cae80657f0ff782e7ccace810e9e723f8.tar.xz | |
Merge branch 'db/doc-workflows-neuter-the-maintainer'
Docfix.
* db/doc-workflows-neuter-the-maintainer:
doc: reword gitworkflows.txt for neutrality
Diffstat (limited to 'Documentation/gitworkflows.txt')
| -rw-r--r-- | Documentation/gitworkflows.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/gitworkflows.txt b/Documentation/gitworkflows.txt index 02569d0614..926e044d09 100644 --- a/Documentation/gitworkflows.txt +++ b/Documentation/gitworkflows.txt @@ -407,8 +407,8 @@ follows. `git pull <url> <branch>` ===================================== -Occasionally, the maintainer may get merge conflicts when he tries to -pull changes from downstream. In this case, he can ask downstream to +Occasionally, the maintainer may get merge conflicts when they try to +pull changes from downstream. In this case, they can ask downstream to do the merge and resolve the conflicts themselves (perhaps they will know better how to resolve them). It is one of the rare cases where downstream 'should' merge from upstream. |