after trying 'git pull --rebase' everything worked just fine! -----Original Message----- From: Andre Klapper [mailto:ak...@gmx.net] Sent: Saturday, April 20, 2013 1:04 PM To: Victor Ibragimov Cc: gnome-i18n@gnome.org Subject: RE: gtk3 build broken by Tajik translation
On Sat, 2013-04-20 at 10:08 +0500, Victor Ibragimov wrote: > I get this error while pushing the files. Just want to make sure that > running 'git pull --rebase' will fix the problem. So did you try git pull --rebase? Because that's what the error message says. > remote: Merge branch 'master' of ssh://git.gnome.org/git/gtk+ > remote: > remote: Looks like it was produced by typing 'git pull' without the --rebase > remote: option when you had local changes. Running 'git pull --rebase' now > remote: will fix the problem. Then please try, 'git push' again. Please see: > remote: > remote: http://live.gnome.org/Git/Help/ExtraMergeCommits > remote: --- > To ssh://..........@git.gnome.org/git/gtk+ > ! [remote rejected] master -> master (pre-receive hook declined) > error: failed to push some refs to 'ssh://...........@git.gnome.org/git/gtk+' > git did not exit cleanly (exit code 1) (17391 ms @ 4/20/2013 9:46:24 AM) > > > > > > -----Original Message----- > From: gil forcada [mailto:gilforc...@gmail.com] On Behalf Of Gil Forcada > Sent: Saturday, April 20, 2013 3:11 AM > To: Victor Ibragimov > Cc: gnome-i18n@gnome.org > Subject: Re: gtk3 build broken by Tajik translation > > El ds 20 de 04 de 2013 a les 02:10 +0500, en/na Victor Ibragimov va > escriure: > > For some reasons the commit of 'po-properties' file failed. > > [remote rejected] master -> master (pre-receive hook declined) > > > > I have attached the file for someone to help with the commit. > > > > Thanks, > > Victor > > I just pushed it to master branch and I did not get any error... > > Cheers, > -- Andre Klapper | ak...@gmx.net http://blogs.gnome.org/aklapper/ _______________________________________________ gnome-i18n mailing list gnome-i18n@gnome.org https://mail.gnome.org/mailman/listinfo/gnome-i18n
