[Bugs] #1525 UNSP: Pootle error while commit file

[Sugar Labs Bugs]

#1525: Pootle error while commit file
------------------------------------------+---------------------------------
    Reporter:  carlo                      |          Owner:  sayamindu                  
        Type:  defect                     |         Status:  new                        
    Priority:  Unspecified by Maintainer  |      Milestone:  Unspecified by Release Team
   Component:  localization               |        Version:  Unspecified                
    Severity:  Major                      |       Keywords:  Pootle commit labyrinth.po 
Distribution:  Unspecified                |   Status_field:  New                        
------------------------------------------+---------------------------------
 Errore
 [GIT] pull failed (['git', '--git-dir',
 u'/srv/pootle/checkouts/honey/labyrinth/.git', 'pull']): error: Entry
 'po/labyrinth.pot' not uptodate. Cannot merge. fatal: merging of trees
 8ac0717c6959e10d051c34f108ea4ba5ab0c8fcb and
 3070df161aded2ff7bde96c1eb90224526b41217 failed Merge with strategy
 recursive failed.

 while committing labyrinth.po for italian language

-- 
Ticket URL: <http://bugs.sugarlabs.org/ticket/1525>
Sugar Labs <http://sugarlabs.org/>
Sugar Labs bug tracking system