chore: use merge for templates
This commit is contained in:
@@ -32,9 +32,9 @@ fix: ## fix and reformat code
|
|||||||
@$(NPM) run format
|
@$(NPM) run format
|
||||||
@$(NPM) run lint-fix
|
@$(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 remote | grep template &>/dev/null) || git remote add template https://github.com/klemek/vue-boilerplate.git
|
||||||
git fetch template
|
git fetch template
|
||||||
git rebase template/master
|
git merge template/master --allow-unrelated-histories
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user