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

[Paolo Corti]

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

--
Paolo Corti
Geospatial software developer
web: http://www.paolocorti.net
twitter: @capooti
skype: capooti