Update .gitmodules

Changed .gitmodules update behavior to merge from rebase which is safer.
TrustedComputingGroup · Oct 7, 2024 · 6939f10 · 6939f10
1 parent 694f74f
commit 6939f10
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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