Skip to content

Commit

Permalink
Force push latest release tracking branch
Browse files Browse the repository at this point in the history
Added in #232

The push failed in the most recent release/build:

```
To [email protected]:alphagov/govuk_elements.git
 ! [rejected]        master -> latest-release (non-fast-forward)
error: failed to push some refs to '[email protected]: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.
  • Loading branch information
dsingleton authored Aug 5, 2016
1 parent d8330d5 commit d566811
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion jenkins.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit d566811

Please sign in to comment.