chore: use merge for templates

2025-12-20 16:11:00 +01:00
parent 6f3ac01245
commit 12cc248df4
1 changed files with 2 additions and 2 deletions
@@ -32,9 +32,9 @@ fix: ## fix and reformat code
 	@$(NPM) run format
 	@$(NPM) run lint-fix

-rebase-template: ## update code from template
+update-template: ## update code from template
 	@(git remote | grep template &>/dev/null) || git remote add template https://github.com/klemek/vue-boilerplate.git
 	git fetch template
-	git rebase template/master
+	git merge template/master --allow-unrelated-histories