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

pushes are rejected with a non-fast-forward error (looks like #36) #82

Open
xt0ph opened this issue Mar 11, 2020 · 0 comments
Open

pushes are rejected with a non-fast-forward error (looks like #36) #82

xt0ph opened this issue Mar 11, 2020 · 0 comments

Comments

@xt0ph
Copy link

xt0ph commented Mar 11, 2020

Hello,

It seems to me to have the same problem as issue #36 but with a difference concerning objects already marked.

Version of git: 2.20.1
Mercurial version: 4.8.2

git push origin branches/default 
searching for changes
no changes found
error: Object 736b561dfa69db730f2069506243926bfa6b96b3 already has a mark
error: Object 2047f2366b6e87a7b76a97057153aa1cf6d5d856 already has a mark
error: Object 8b8880400913aa33f7b32b7469bfab5043cdfa85 already has a mark
error: Object 9523e22a804a41bd919cfe25e3bfbde5cc700628 already has a mark
error: Object dba7f49fcdb297ecdae980f7992e35464387a461 already has a mark
error: Object 9aefc99db6e28fe35943e32cf1779b3fffb3e167 already has a mark
error: Object 23798f9c2c8aad060cfcb64ff60ca3bb1a4eeb68 already has a mark
error: Object 3526ec0575cc8bb1f5c11f07ee5ce9217c1deba1 already has a mark
error: Object 9794c562adcb326f9ce95384373a140cf8c2c294 already has a mark
To hg::ssh://[email protected]/xt0ph/tryton_dtl-incoterm
 ! [rejected]        branches/default -> branches/default (non-fast-forward)
error: failed to push some refs to 'hg::ssh://[email protected]/xt0ph/tryton_dtl-incoterm'
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.

but

git pull origin branches/default
searching for changes
no changes found
From hg::ssh://[email protected]/xt0ph/tryton_dtl-incoterm
 * branch            branches/default -> FETCH_HEAD
Already up to date.

Is there a way to solve that ?

regards.

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