[Sugar-devel] Conflicts in pootle

[Walter Bender]

On Wed, Jan 12, 2011 at 10:24 AM, Gonzalo Odiard <gonzalo at laptop.org> wrote:
> Walter:
> Pootle generate the pot file from the sources he takes from git.
> You can read
> http://wiki.sugarlabs.org/go/Translation_Team/i18n_Best_Practices
> and http://wiki.sugarlabs.org/go/Translation_Team/Workflow
>
> 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