[SAC] [OSGeo] #2981: Weblate grass project not updating
OSGeo
trac_osgeo at osgeo.org
Fri Sep 22 12:52:43 PDT 2023
#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):
The list of instructions I made
{{{
git clone https://github.com/OSGeo/grass
2056 git clone --branch main https://github.com/OSGeo/grass
2057 cd grass/
2058 git remote add weblate https://weblate.osgeo.org/git/grass-
gis/grasslibs/
2059 git remote update weblate
2060 git merge weblate/main
2061 git diff weblate/main
2062 git rebase origin/main
# a conflict happened here
2063 git status
2064 vi locale/po/grasslibs_ru.po
2065 git add locale/po/grasslibs_ru.po
2066 git rebase --continue
2067 git status
2068 vi locale/po/grasswxpy_ru.po
2070 git add locale/po/grasswxpy_ru.po
2071 git rebase --continue
2072 git status
2073 vi locale/po/grassmods_ru.po
2074 git add locale/po/grassmods_ru.po
2075 git rebase --continue
2076 git status
2077 vi locale/po/grassmods_ru.po
2078 git add locale/po/grassmods_ru.po
2079 git rebase --continue
2080 git status
2081 vi locale/po/grasslibs_de.po
2082 git add locale/po/grasslibs_de.po
2083 git rebase --continue
2084 git status
2085 vi locale/po/grassmods_de.po
2086 git add locale/po/grassmods_de.po
2087 git rebase --continue
2088 git diff origin/main locale/po/
2089 git diff origin/main locale/
2090 git status
# could not push, so created a branch for the PR
2093 git push
2094 git switch -c changes-done-trac-2981
2095 git push
2096 git push --set-upstream origin changes-done-trac-2981
}}}
--
Ticket URL: <https://trac.osgeo.org/osgeo/ticket/2981#comment:19>
OSGeo <https://osgeo.org/>
OSGeo committee and general foundation issue tracker.
More information about the Sac
mailing list