Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump to v1.4.0rc2 without tbump #276

Merged
merged 1 commit into from
Jun 21, 2023
Merged

Bump to v1.4.0rc2 without tbump #276

merged 1 commit into from
Jun 21, 2023

Conversation

forsyth2
Copy link
Collaborator

Bump to v1.4.0rc2 without tbump.

Had to do this PR manually rather than using tbump. With tbump, I kept running into the following error:

[v1.4.0rc2 7199f03] Bump to 1.4.0rc2
 4 files changed, 4 insertions(+), 4 deletions(-)
To github.com:E3SM-Project/zstash.git
 ! [rejected]        main -> main (non-fast-forward)
error: failed to push some refs to 'github.com:E3SM-Project/zstash.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.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
Error: Command `git push upstream main` failed

@forsyth2 forsyth2 added the Update version Code specifically to update the version label Jun 21, 2023
@forsyth2 forsyth2 merged commit 3918b02 into main Jun 21, 2023
@forsyth2 forsyth2 deleted the v1.4.0rc2 branch June 21, 2023 21:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Update version Code specifically to update the version
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant