[Sugar-devel] Conflicts in pootle

[Gonzalo Odiard]

Fortunately is not in all your projects, you are too much prolific ;)

I can do a "pull -s ours" in the pootle server to merge your changes but
preserving the changes in pootle.
>From your activities, I only see conflicts in VisualMatch.

Gonzalo


>
> My mistake. I have screwed this up on all of my projects. What is the
> best way to resolve the conflicts?
>
> -walter
>
> >
> >> I don't understand how the .pot file can represent a conflict. Pootle
> >> is suppose to pull .pot files from git, not push to git.
> >>
> >> -walter
> >> >
> >
> >
>
>
>
> --
> Walter Bender
> Sugar Labs
> http://www.sugarlabs.org
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sugarlabs.org/archive/sugar-devel/attachments/20110112/25ae1742/attachment-0001.html>