[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

error: failed to push some refs to 'git@live.debian.net:/live-manual.git'


Today I made a commit on the debian-next branch as usual:
1st git pull
2nd make commit
3rd git add .
4th git commit -a -m ""
5th git push

The commit was acknowledged by the system: 
<CIA-8> chals debian-next * rf7539fc live-manual/manual/ (16 files in 14 dirs): Fixing grammar in about_manual.ssi.po French translation.

However I got a strange message:

Successful... please do:

  * git add .
  * git commit -a -m "Your commit message."
  * git push
chals@odd:~/live-manual$ git add .
chals@odd:~/live-manual$ git commit -a -m "Fixing grammar in about_manual.ssi.po French translation."
[debian-next f7539fc] Fixing grammar in about_manual.ssi.po French translation.
 16 files changed, 50 insertions(+), 50 deletions(-)
chals@odd:~/live-manual$ git push
Counting objects: 50, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (30/30), done.
Writing objects: 100% (30/30), 6.19 KiB, done.
Total 30 (delta 26), reused 0 (delta 0)
To git@live.debian.net:/live-manual.git
   e9f2a57..f7539fc  debian-next -> debian-next
 ! [rejected]        debian -> debian (non-fast-forward)
error: failed to push some refs to 'git@live.debian.net:/live-manual.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.

Pay attention to:

 ! [rejected]        debian -> debian (non-fast-forward)

I'm not merging anything to the debian branch. What can the matter be? What can I do? Just ignore it?

Best wishes.


Reply to: