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

🚚 GitHub workflow to automatically resolve Weblate conflicts #5315

Merged
merged 2 commits into from
Mar 26, 2024

Conversation

rix0rrr
Copy link
Collaborator

@rix0rrr rix0rrr commented Mar 26, 2024

Weblate sometimes still creates commits that lead to conflicts. Add a script that will automatically resolve them. If it works, we can start running it automatically whenever necessary.

@rix0rrr rix0rrr merged commit e3f7c23 into main Mar 26, 2024
10 checks passed
@rix0rrr rix0rrr deleted the automatic-conflict-resolve branch March 26, 2024 11:50
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