From 195ce55aed8a4a80abf557cef9935cf182740b12 Mon Sep 17 00:00:00 2001
From: Javier Marcos <1271349+javuto@users.noreply.github.com>
Date: Sun, 7 Jun 2026 16:24:07 +0200
Subject: [PATCH] Makefile job to merge develop into main

---
 Makefile | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Makefile b/Makefile
index fb91590..685170c 100644
--- a/Makefile
+++ b/Makefile
@@ -67,3 +67,12 @@ release:
 # Create a snapshot release for testing without publishing
 release-snapshot:
 	goreleaser release --snapshot --clean
+
+# Merge locally develop into main, usually to prepare for release
+develop-merge:
+	git pull
+	git checkout main
+	git pull origin main
+	git merge develop
+	git push origin main
+