From caba58004c4a681cca9856c0f3fc35c821a92472 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Wed, 25 May 2022 16:39:14 +0200
Subject: [PATCH] chore(utils): Add merge function to make

---
 utils/git.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/utils/git.mk b/utils/git.mk
index dece38bf7..2ec04aa25 100644
--- a/utils/git.mk
+++ b/utils/git.mk
@@ -3,3 +3,8 @@ commit: ## Commit changes to git, push them to the remote and inform flux about
 	git commit -v
 	git push
 	make flux-update-git
+
+merge:
+	git fetch
+	git merge --no-ff origin/$(BRANCH) --no-edit
+	git push origin --delete $(BRANCH)
-- 
GitLab