From 06eda15f45434056ed7f3ea80df551d251f2ab82 Mon Sep 17 00:00:00 2001 From: David Kastrup Date: Wed, 6 Jun 2012 20:29:38 +0200 Subject: [PATCH] Issue 2590: GUB release instructions fail for upload --- Documentation/contributor/release-work.itexi | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/Documentation/contributor/release-work.itexi b/Documentation/contributor/release-work.itexi index baa68a85e4..7c78ce302d 100644 --- a/Documentation/contributor/release-work.itexi +++ b/Documentation/contributor/release-work.itexi @@ -184,9 +184,10 @@ make lilypond-upload \ @enumerate -@item Switch back to master and get the updated news: +@item Update the current staging branch with the current news: @example +git fetch git checkout origin/staging git merge origin/release/unstable @end example @@ -214,6 +215,16 @@ git commit -m "Release: bump version." VERSION git push origin HEAD:staging @end example +If the push fails with a message like + +@example + ! [rejected] HEAD -> staging (non-fast-forward) +@end example + +@noindent +it means that somebody else updated the staging branch while you were +preparing your change. In that case, you need to restart the Post +Release process. Otherwise, proceed: @item (for now) do a @code{make doc} and manually upload: -- 2.39.5