From 6939f10e340bca1d8f3973b4ecfe5b6c42a13d04 Mon Sep 17 00:00:00 2001
From: nedmsmith <ned.smith@intel.com>
Date: Mon, 7 Oct 2024 13:00:53 -0700
Subject: [PATCH] Update .gitmodules

Changed .gitmodules update behavior to merge from rebase which is safer.
---
 .gitmodules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index 6e5a8ce..bb7b8dc 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,4 +2,4 @@
 	path = draft-ietf-rats-corim
 	url = https://github.com/ietf-rats-wg/draft-ietf-rats-corim
 	branch = main
-	update = rebase
+	update = merge