From 1b22d8a1b8845fcbeb29b8f969d38281f438cc93 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Tue, 14 Apr 2026 08:36:34 +0200
Subject: [PATCH] make: add merge target for "community" origin (or upstream
 equivalent)

(cherry picked from commit 28ba22564be0efd18d2cc787415a5fc7eba97c41)
(cherry picked from commit bf8545b285edab9e618945a00e36f5fc04f9e201)
(cherry picked from commit 469b57f3db2cdb64c5fa2a910144f784e92d6fd9)
---
 Mk/defaults.mk | 1 +
 Mk/git.mk      | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/Mk/defaults.mk b/Mk/defaults.mk
index ccb287a39d..922c199231 100644
--- a/Mk/defaults.mk
+++ b/Mk/defaults.mk
@@ -116,3 +116,4 @@ TESTDIR?=	${.CURDIR}/src/opnsense/mvc/tests
 CORE_MAINS=	master main
 CORE_MAIN?=	${CORE_MAINS:[1]}
 CORE_STABLE?=	stable/${CORE_ABI}
+CORE_UPSTREAM?=	community
diff --git a/Mk/git.mk b/Mk/git.mk
index 78e7c9288a..e8f1bf1ad0 100644
--- a/Mk/git.mk
+++ b/Mk/git.mk
@@ -134,6 +134,10 @@ push:
 	@${GIT} push
 	@${GIT} checkout ${CORE_MAIN}
 
+merge: ${CORE_MAIN}
+	@${GIT} fetch ${CORE_UPSTREAM}
+	@${GIT} merge ${CORE_UPSTREAM}/${CORE_MAIN}
+
 checkout:
 .for DIR in ${.CURDIR}/src
 .if exists(${DIR})