Skip to content

[Backport master] Fix server l10n compilation - #12832

Merged
sbrunner merged 1 commit into
masterfrom
ghci/backport/12829-to-master
Jun 12, 2026
Merged

[Backport master] Fix server l10n compilation#12832
sbrunner merged 1 commit into
masterfrom
ghci/backport/12829-to-master

Conversation

@geo-ghci-int

@geo-ghci-int geo-ghci-int Bot commented Apr 15, 2026

Copy link
Copy Markdown
Contributor

Backport of #12829 to master

Error on cherry-picking: 277912d

To continue do:

git fetch && \
  git checkout ghci/backport/12829-to-master && \
  git reset --hard HEAD^ && \
  git cherry-pick 277912d080492f03a7f4d58a5889f3043050edb4

Resolve the conflict, then:

git add <file> && \
  git cherry-pick --continue

When all the conflicts are resolved, push the branch:

git push origin ghci/backport/12829-to-master --force

@arnaud-morvan
arnaud-morvan force-pushed the ghci/backport/12829-to-master branch from 3f918d2 to 64b10ea Compare April 15, 2026 17:09
@sbrunner
sbrunner force-pushed the ghci/backport/12829-to-master branch from 64b10ea to 3005cc8 Compare June 11, 2026 16:36
@sbrunner
sbrunner merged commit 7484f90 into master Jun 12, 2026
24 checks passed
@sbrunner
sbrunner deleted the ghci/backport/12829-to-master branch June 12, 2026 06:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants