From b8a2c20f7bb2662f413d9cf79235c1683508d5f0 Mon Sep 17 00:00:00 2001
From: nedmsmith <ned.smith@intel.com>
Date: Tue, 10 Sep 2024 16:44:56 -0700
Subject: [PATCH] Update .gitmodules

Changed action to merge from rebase since this is safer.
---
 .gitmodules | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index c4d0770..fce189e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,9 +2,9 @@
 	path = draft-ietf-rats-corim
 	url = https://github.com/ietf-rats-wg/draft-ietf-rats-corim
 	branch = main
-	update = rebase
+	update = merge 
 [submodule "concise-evidence"]
 	path = concise-evidence
 	url = https://github.com/TrustedComputingGroup/concise-evidence
 	branch = main
-	update = rebase
+	update = merge