Hello, I have a strange problem with Salsa's git repo for ITK. Today I did a fresh clone and confirmed that it's not something I did locally. I don't understand what the issue is and hoping someone here can help. After the clone, I did a simple change to the control file, built the source package, uploaded, etc. The problem comes with trying to push things back to salsa: steve@riemann:~/Packages/insighttoolkit/salsa$ gbp push gbp:info: Pushing debian/5.3.0-4 to origin gbp:info: Pushing upstream/5.3.0 to origin gbp:info: Pushing refs/heads/master to origin:refs/heads/master gbp:info: Pushing b2132ae657fd350bd02946bf95a2fc27240d8efc to origin:refs/ heads/upstream gbp:error: Error running git push: To salsa.debian.org:med-team/ insighttoolkit.git ! [rejected] b2132ae657fd350bd02946bf95a2fc27240d8efc -> upstream (non-fast-forward) error: failed to push some refs to 'salsa.debian.org:med-team/ insighttoolkit.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. gbp:error: Failed to push some refs. OK, so just pull, resolve and push ??? Let's try: steve@riemann:~/Packages/insighttoolkit/salsa$ git checkout upstream Switched to branch 'upstream' Your branch is up to date with 'origin/upstream'. steve@riemann:~/Packages/insighttoolkit/salsa$ git pull Already up to date. steve@riemann:~/Packages/insighttoolkit/salsa$ git push Everything up-to-date steve@riemann:~/Packages/insighttoolkit/salsa$ git checkout master Switched to branch 'master' Your branch is up to date with 'origin/master'. steve@riemann:~/Packages/insighttoolkit/salsa$ gbp push gbp:info: Pushing debian/5.3.0-4 to origin gbp:info: Pushing upstream/5.3.0 to origin gbp:info: Pushing refs/heads/master to origin:refs/heads/master gbp:info: Pushing b2132ae657fd350bd02946bf95a2fc27240d8efc to origin:refs/ heads/upstream gbp:error: Error running git push: To salsa.debian.org:med-team/ insighttoolkit.git ! [rejected] b2132ae657fd350bd02946bf95a2fc27240d8efc -> upstream (non-fast-forward) error: failed to push some refs to 'salsa.debian.org:med-team/ insighttoolkit.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. gbp:error: Failed to push some refs. Same error! Any ideas? Thanks, -Steve
Attachment:
signature.asc
Description: This is a digitally signed message part.