[Qgis-community-team] git pull conflicts on the server

[Otto Dassau]

Am Tue, 6 Nov 2012 19:26:05 +0100
schrieb Paolo Corti <pcorti at gmail.com>:

> On Tue, Nov 6, 2012 at 6:38 PM, Otto Dassau <dassau at gbd-consult.de> wrote:
> > Hi,
> >
> > ok, but this should not make problems with git pull, I guess.
> >
> > Regards
> > Otto
> >
> 
> My guess is that it was modified on the server itself (maybe with
> Pootle) and never committed back and then changed from another client
> and pushed to the repository, this causing the conflict.
> As we do not need it, just remove the file and pull again from the server.
> cheers
> p

ok, here I have a question. Does pootle not write to git? Does it change the
files locally on the server? And if so, do we need to push the pootle
changes back to git?

btw: I removed the file and pulled again.

Regards
Otto