This command is necessary because Git uses markers to control the
changes over the time.
So, when the directory suffer changes before you commit something, you
need to use this command to have your local directory similar to the
remote local.
Kindly Regards,
Enrico Nicoletto.
___
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
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
