From 12cc248df41dc269cb8372f2609bb117c6935015 Mon Sep 17 00:00:00 2001
From: klemek <klemek.dev@proton.me>
Date: Sat, 20 Dec 2025 16:11:00 +0100
Subject: [PATCH] chore: use merge for templates

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index dd71fdc..0430bad 100644
--- a/Makefile
+++ b/Makefile
@@ -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