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.

Sign up for GitHub

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

🚚 Update weblate merge-resovling script #6163

Merged
merged 4 commits into from
Feb 7, 2025
Merged

🚚 Update weblate merge-resovling script #6163

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8315bf0
Update weblate merge-resovling script
boryanagoncharenko Feb 5, 2025
4b763e7
Merge branch 'main' into weblate_merge
mergify[bot] Feb 6, 2025
04c5988
add only the grammars folder
boryanagoncharenko Feb 7, 2025
ca08c03
Merge branch 'main' into weblate_merge
boryanagoncharenko Feb 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions tools/merge-weblate-resolving-conflicts.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ git checkout -B weblate-hedy-adventures-conflicts weblate-main/main

# Normalize files in Weblate main repo
doit run _autopr _autopr_weblate
git add .
git commit -am 'Normalize Weblate branch' --allow-empty

# Merge from origin, preferring Weblate's changes
Expand Down