From d56681192085a055bae0424e06f9582a9ce9f280 Mon Sep 17 00:00:00 2001 From: David Singleton Date: Fri, 5 Aug 2016 09:53:22 +0100 Subject: [PATCH] Force push latest release tracking branch Added in https://github.com/alphagov/govuk_elements/pull/232 The push failed in the most recent release/build: ``` To git@github.com:alphagov/govuk_elements.git ! [rejected] master -> latest-release (non-fast-forward) error: failed to push some refs to 'git@github.com:alphagov/govuk_elements.git' hint: Updates were rejected because a pushed branch tip is behind its remote hint: counterpart. Check out this branch and integrate the remote changes hint: (e.g. 'git pull ...') before pushing again. ``` Given it's just for tracking, we can safely force push. --- jenkins.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins.sh b/jenkins.sh index d609e2a39..4aadcf7fb 100755 --- a/jenkins.sh +++ b/jenkins.sh @@ -18,6 +18,6 @@ if [ "$MASTER_SHA" == "$HEAD_SHA" ]; then git push origin $VERSION_TAG # Alias branch for the most recently released tag, for easier diffing - git push origin master:latest-release + git push -f origin master:latest-release fi fi