[SAC] [OSGeo] #2981: Weblate grass project not updating

[OSGeo]

#2981: Weblate grass project not updating
---------------------------+---------------------------------------
 Reporter:  robe           |       Owner:  sac@…
     Type:  task           |      Status:  reopened
 Priority:  normal         |   Milestone:  Sysadmin Contract 2023-I
Component:  Systems Admin  |  Resolution:
 Keywords:                 |
---------------------------+---------------------------------------
Changes (by neteler):

 * status:  closed => reopened
 * resolution:  fixed =>

Comment:

 There seems to be a new issue:

 Now, updating its repo fails with


 {{{
 Rebasing (1/11)
 error: could not apply 96fa6b652... Translated using Weblate (Russian)
 Resolve all conflicts manually, mark them as resolved with
 "git add/rm <conflicted_files>", then run "git rebase --continue".
 You can instead skip this commit: run "git rebase --skip".
 To abort and get back to the state before "git rebase", run "git rebase
 --abort".
 Could not apply 96fa6b652... Translated using Weblate (Russian)
 Auto-merging locale/po/grasslibs_ru.po
 CONFLICT (content): Merge conflict in locale/po/grasslibs_ru.po
  (1)
 }}}

 Reported in:
 https://github.com/OSGeo/grass/pull/3065#issuecomment-1715057905
-- 
Ticket URL: <https://trac.osgeo.org/osgeo/ticket/2981#comment:6>
OSGeo <https://osgeo.org/>
OSGeo committee and general foundation issue tracker.