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

[release.ngs] git push fails #634

Open
ilyash-b opened this issue Mar 18, 2023 · 2 comments
Open

[release.ngs] git push fails #634

ilyash-b opened this issue Mar 18, 2023 · 2 comments
Labels

Comments

@ilyash-b
Copy link
Contributor

$(git push) after $(git commit -am "Releasing version: ${version}") fails with

To github.com:ngs-lang/ngs.git
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'github.com:ngs-lang/ngs.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

Merging from remote master helps but it's a workaround, not a solution

@ilyash-b ilyash-b added the bug label Mar 18, 2023
@ilyash-b
Copy link
Contributor Author

In local temp dir, master branch:

$ git log --no-merges origin/master ^master
commit 9ef4220222d3ba4c1546a4e67c9c552a76671f93
Author: Ilya Sher <34807039+ilyash-b@users.noreply.github.com>
Date:   Sat Mar 18 15:41:06 2023 +0400

    Releasing version: 0.2.15

commit bdfb2fd70162cd7183ac8d45c774a5718cb19b09 (tag: v0.2.14, Artturin/master)
Author: Ilya Sher <34807039+ilyash-b@users.noreply.github.com>
Date:   Sat Apr 16 15:51:11 2022 +0300

    Releasing version: 0.2.14

@ilyash-b
Copy link
Contributor Author

Workaround. While browser was open:

git stash
git merge origin/master -s ours
git stash pop
git add version.h
git log --no-merges origin/master ^master

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

No branches or pull requests

1 participant