Skip to content

Commit

Permalink
🚚 Update weblate merge-resovling script (#6163)
Browse files Browse the repository at this point in the history
Currently, the merge-weblate-resolving-conflicts script executes a `doit run _autopr` which generates code and then immediately does a `git commit`. If a new language is added though, some of the newly generated files remain untracked and are not included in the commit. This causes the following merge command to fail:

```
+ git merge -s recursive -X ours origin/main --no-edit
error: The following untracked working tree files would be overwritten by merge:
	grammars/keywords-jbo.lark
Please move or remove them before you merge.
```

Evaluate whether adding a `git add .` before the commit would have unwanted side effects.
  • Loading branch information
boryanagoncharenko authored Feb 7, 2025
1 parent ed49bfa commit 3d90ae1
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions tools/merge-weblate-resolving-conflicts.sh
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 grammars
git commit -am 'Normalize Weblate branch' --allow-empty

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

0 comments on commit 3d90ae1

Please sign in to comment.