development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-28 19:25:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'db/doc-workflows-neuter-the-maintainer'

Browse source 
Docfix.

* db/doc-workflows-neuter-the-maintainer:
  doc: reword gitworkflows.txt for neutrality
This commit is contained in:
Junio C Hamano 2017-12-27 11:16:25 -08:00
commit f7bbca1cae
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Documentation/gitworkflows.txt
View file

@ -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.