Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Trigger a Weblate reset after pushing translations #5347

Merged
merged 1 commit into from
Apr 1, 2024
Merged

Conversation

rix0rrr
Copy link
Collaborator

@rix0rrr rix0rrr commented Apr 1, 2024

After we have told Weblate to push all of its pending commits, it should forget about them.

The reason is that we may revert some code samples, and when the translations PR finally squash-merges its way onto main and gets back to Weblate, it will see a conflict with its own pending changes.

By resetting, it will forget about its own pending changes, and consume the changes when they finally come in from the upstream repo.

This probably leads to an inconsistency window in which it looks for about ~1hr like the changes have disappeared. Fear not, they haven't, they will come back once the PR is in and Weblate syncs from the main repo.

After we have told Weblate to push all of its pending commits, it should
forget about them.

The reason is that we may revert some code samples, and when the
translations PR finally squash-merges its way onto `main` and gets back
to Weblate, it will see a conflict with its own pending changes.

By resetting, it will forget about its own pending changes, and think
we are just great upstream translators!
@rix0rrr rix0rrr merged commit 9074cd3 into main Apr 1, 2024
9 of 10 checks passed
@rix0rrr rix0rrr deleted the weblate-reset branch April 1, 2024 11:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

1 participant