We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent a3683e7 commit 8315bf0Copy full SHA for 8315bf0
tools/merge-weblate-resolving-conflicts.sh
@@ -11,6 +11,7 @@ git checkout -B weblate-hedy-adventures-conflicts weblate-main/main
11
12
# Normalize files in Weblate main repo
13
doit run _autopr _autopr_weblate
14
+git add .
15
git commit -am 'Normalize Weblate branch' --allow-empty
16
17
# Merge from origin, preferring Weblate's changes
0 commit comments