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

[Paolo Corti]

On Tue, Nov 6, 2012 at 7:30 PM, Otto Dassau <dassau at gbd-consult.de> wrote:
> 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.
>

As with any git client, there are 2 distinct points:
1. save the translated file
2. commit and push the translated file (clicking on the "Commit to
CVS" link in the review tab)

For this reasons the files should be the smallest possible, and
translators should pull and commit and push very often.

Please refer to these guidelines:
http://translate.sourceforge.net/wiki/pootle/version_control

"When updating from version control there is the possibility that a
third party could have changed the file (another translator accessing
the version control directly could have made a change). Traditionally
in version control this would create a file with conflicts. Those
familiar with version control conflicts will understand that we can't
afford to have that as we won't be able to resolve them. Therefore
Pootle will be conservative and will consider the version control
system to be the authority and any conflicts in the local file get be
converted to suggestions. These suggestions then need to be reviewed
by a translator with 'review' rights."

p

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