[DRE-commits] pushing branch after gbp-pq rebase

[Antono Vasiljev]

Hello, All.

I followed steps described in gbp-pq manual and rebased my
patch-queue/master against newly imported version. Now i cannot push
this branch to remote:

------------------------------------------------------------
(master ✓) shelr git push 
Counting objects: 64, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (36/36), done.
Writing objects: 100% (42/42), 7.90 KiB, done.
Total 42 (delta 23), reused 0 (delta 0)
To git+ssh://git.debian.org/git/pkg-ruby-extras/shelr.git
   73f0f9b..3d433c3  master -> master
   934efd9..a408c58  pristine-tar -> pristine-tar
   9376975..98ad8fd  upstream -> upstream
 ! [rejected]        patch-queue/master -> patch-queue/master (non-fast-forward)
error: failed to push some refs to 'git+ssh://git.debian.org/git/pkg-ruby-extras/shelr.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes (e.g. 'git pull') before pushing again.  See the
'Note about fast-forwards' section of 'git push --help' for details.
------------------------------------------------------------

git push -f origin patch-queue/master:patch-queue/master

--------------------------------------------------------------------------------
(master ✓) shelr git push -f origin patch-queue/master:patch-queue/master
Counting objects: 7, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (3/3), done.
Writing objects: 100% (4/4), 351 bytes, done.
Total 4 (delta 2), reused 0 (delta 0)
remote: error: denying non-fast-forward refs/heads/patch-queue/master (you should pull first)
To git+ssh://git.debian.org/git/pkg-ruby-extras/shelr.git
 ! [remote rejected] patch-queue/master -> patch-queue/master (non-fast-forward)
error: failed to push some refs to 'git+ssh://git.debian.org/git/pkg-ruby-extras/shelr.git'
--------------------------------------------------------------------------------

trying pull as git suggests:

--------------------------------------------------------------------------------
(patch-queue/master ✓) shelr git pull origin patch-queue/master:patch-queue/master
>From git+ssh://git.debian.org/git/pkg-ruby-extras/shelr
 ! [rejected]        patch-queue/master -> patch-queue/master  (non-fast-forward)
--------------------------------------------------------------------------------

Any suggestion?

-- 
http://shelr.tv - screencasting for terminal