From 4b42fc6be0ae89f6efdf8ef1cbcd29f4264476b0 Mon Sep 17 00:00:00 2001 From: Richard Brooksby Date: Fri, 13 Jan 2023 11:48:58 +0000 Subject: [PATCH] Clarifying what failure of pull might look like. --- mps/procedure/pull-request-merge.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mps/procedure/pull-request-merge.rst b/mps/procedure/pull-request-merge.rst index 2b8ce6d6379..d85615f5797 100644 --- a/mps/procedure/pull-request-merge.rst +++ b/mps/procedure/pull-request-merge.rst @@ -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::