Update .gitmodules

Changed action to merge from rebase since this is safer.
nedmsmith · Sep 10, 2024 · b8a2c20 · b8a2c20
1 parent 47f8a6c
commit b8a2c20
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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