From c9ecbcc9e208c8e825239a9d8d103155c8dac473 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Fri, 13 Jan 2023 03:54:23 +0100 Subject: [PATCH] Add weblate-merge script for easier merging --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 76b469e8e..c74ca7168 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "script": "ts-node", "weblate-merge": "./scripts/automerge-translations.sh", "weblate-add-upstream": "git remote add weblate-github git@github.com:weblate/MapComplete.git", - "weblate-fix": "git remote update weblate-github; git merge weblate-github/weblate-mapcomplete-core; git merge weblate-github/weblate-mapcomplete-layers; git merge weblate-github/weblate-mapcomplete-layer-translations", + "weblate-merge": "git remote update weblate-github; git merge weblate-github/weblate-mapcomplete-core weblate-github/weblate-mapcomplete-layers weblate-github/weblate-mapcomplete-layer-translations", "weblate-fix-heavy": "git remote rm weblate-layers; git remote add weblate-layers https://hosted.weblate.org/git/mapcomplete/layers/; git remote update weblate-layers; git merge weblate-layers/master", "housekeeping": "npm run generate && npm run generate:docs && npm run generate:contributor-list && npm run format && git add assets/ langs/ Docs/ **/*.ts Docs/* && git commit -m 'Housekeeping...'", "parseSchools": "ts-node scripts/schools/amendSchoolData.ts",