Skip to content

Commit 8315bf0

Browse files
Update weblate merge-resovling script
1 parent a3683e7 commit 8315bf0

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

Diff for: tools/merge-weblate-resolving-conflicts.sh

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ git checkout -B weblate-hedy-adventures-conflicts weblate-main/main
1111

1212
# Normalize files in Weblate main repo
1313
doit run _autopr _autopr_weblate
14+
git add .
1415
git commit -am 'Normalize Weblate branch' --allow-empty
1516

1617
# Merge from origin, preferring Weblate's changes

0 commit comments

Comments
 (0)