[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:                 |
---------------------------+---------------------------------------
Comment (by cvvergara):

 Again, all the components of GRASS GIS are blocked.

 This repository is not up to date:
 https://github.com/osgeoweblate/grass/tree/weblate-grass-gis-grasslibs

 7 commits behind of
 https://github.com/OSGeo/grass/

 The main problem is conflicts within the Russian translation.
 Will follow this instructions:

 Typical workflow for fixing merge conflicts

 Commit all pending changes in Weblate and lock the translation component.
 (already locked)
     wlc commit; wlc lock


 Add Weblate exported repository as a remote.
     git remote add weblate https://weblate.osgeo.org/git/grass-
 gis/grasslibs/
     git remote update weblate

 Merge Weblate changes and resolve any conflicts.
     git merge weblate/

 Rebase Weblate changes on top of upstream and resolve any conflicts.
     git rebase origin/
 Push changes into upstream repository.
     git push origin

 Weblate should now be able to see updated repository and you can unlock
 it. (can be unlocked in the weblate site)
     wlc pull ; wlc unlock
-- 
Ticket URL: <https://trac.osgeo.org/osgeo/ticket/2981#comment:16>
OSGeo <https://osgeo.org/>
OSGeo committee and general foundation issue tracker.