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

git-ops action errors when pushing commits to main if other commits have already been pushed to main #8

Open
sevenseacat opened this issue Sep 27, 2023 · 0 comments

Comments

@sevenseacat
Copy link
Member

eg. going through merging a bunch of tiny PRs really quickly.

Each build until the last one will fail, because pushing the new commit with the version number/changelog change, is not a fast-forward -

Run git push "***github.com/MyOrg/my-app" HEAD:refs/heads/main refs/tags/v0.99.1
To https://github.com/MyOrg/my-app
 * [new tag]         v0.99.1 -> v0.99.1
 ! [rejected]        HEAD -> main (non-fast-forward)
error: failed to push some refs to 'https://github.com/MyOrg/my-app'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. If you want to integrate the remote changes,
hint: use 'git pull' before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
Error: Process completed with exit code 1.

This is super annoying and makes the build history look a lot worse than it should be!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant