mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-05 05:41:40 -07:00
Code Issues Projects Releases Wiki Activity

Clarifying what failure of pull might look like.

Browse source
This commit is contained in:
Richard Brooksby 2023-01-13 11:48:58 +00:00
parent af15f67720
commit 4b42fc6be0
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
mps/procedure/pull-request-merge.rst
View file

@ -189,9 +189,9 @@ These steps will only rarely need repeating.
git pull --ff-only perforce master
If this doesn't succeed, then GitHub's master and Perforce's master
are in out of sync, and this procedure fails. [It may be possible
to quickly fix that here and now and continue. RB 2023-01-12]
If you get an error, then GitHub's master and Perforce's master are
in out of sync, and this procedure fails. [It may be possible to
quickly fix that here and now and continue. RB 2023-01-12]
4. Merge the branch in to your local master::