From: Mișu M. <du...@l1...> - 2012-10-23 22:48:37
|
On Wed, Oct 24, 2012 at 12:45 AM, Martin Bagge / brother <br...@bs...> wrote: > > It was the push that failed not the commit. [snip] > For libfm and pcmanfm it looks like someone made a successfull push before > I could attend to it. I'll check all the other components now as SF looks > to be available again. I have first encountered a problem with the push of pcmanfm: Failed to commit file: [GIT] push of ('/var/lib/pootle/po/lxde/pcmanfm', 'po/ro.po') failed: To ssh://br...@pc.../gitroot/pcmanfm/pcmanfm ! [rejected] master -> master (non-fast-forward) error: failed to push some refs to 'ssh://br...@pc.../gitroot/pcmanfm/pcmanfm' 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. Now commiting fails with: Failed to commit file: [GIT] commit of ('/var/lib/pootle/po/lxde/pcmanfm', 'po/ro.po') failed: # On branch master # Your branch is ahead of 'origin/master' by 2 commits. # # Changes not staged for commit: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # modified: po/he.po # modified: po/hr.po # modified: po/ko.po # modified: po/pt.po # modified: po/pt_BR.po # # Untracked files: # (use "git add <file>..." to include in what will be committed) # # po/af.po # po/am.po # po/bn_IN.po # po/bs.po # po/eo.po # po/es_VE.po # po/hi.po # po/jv.po # po/kn.po # po/li.po # po/ml.po # po/nb.po # po/nn.po # po/ps.po # po/sq.po # po/ur.po # po/ur_PK.po no changes added to commit (use "git add" and/or "git commit -a") Manual intervention seems to be needed here. Thanks, -- mișu |