mirror of
https://github.com/git/git
synced 2024-10-28 19:25:47 +00:00
Merge branch 'db/doc-workflows-neuter-the-maintainer'
Docfix. * db/doc-workflows-neuter-the-maintainer: doc: reword gitworkflows.txt for neutrality
This commit is contained in:
commit
f7bbca1cae
1 changed files with 2 additions and 2 deletions
|
@ -407,8 +407,8 @@ follows.
|
||||||
`git pull <url> <branch>`
|
`git pull <url> <branch>`
|
||||||
=====================================
|
=====================================
|
||||||
|
|
||||||
Occasionally, the maintainer may get merge conflicts when he tries to
|
Occasionally, the maintainer may get merge conflicts when they try to
|
||||||
pull changes from downstream. In this case, he can ask downstream to
|
pull changes from downstream. In this case, they can ask downstream to
|
||||||
do the merge and resolve the conflicts themselves (perhaps they will
|
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
|
know better how to resolve them). It is one of the rare cases where
|
||||||
downstream 'should' merge from upstream.
|
downstream 'should' merge from upstream.
|
||||||
|
|
Loading…
Reference in a new issue