We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
2 parents 0faff98 + 6b0eb88 commit f7bbca1Copy full SHA for f7bbca1
Documentation/gitworkflows.txt
@@ -407,8 +407,8 @@ follows.
407
`git pull <url> <branch>`
408
=====================================
409
410
-Occasionally, the maintainer may get merge conflicts when he tries to
411
-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
412
do the merge and resolve the conflicts themselves (perhaps they will
413
know better how to resolve them). It is one of the rare cases where
414
downstream 'should' merge from upstream.
0 commit comments