feat(git-folder): add merge support and improve remote handling with new scripts and config management

bin/add-git-folder

@@ -20,13 +20,10 @@ add-git-folder() {
     # Ensure branch is Odoo version
     git -C "$3" switch "$1"
 
-    # Save version
-    save-version
-
-    # Restore staged submodule files
-    git restore --staged .gitmodules "$3"
-
     # Remove from working tree
-    # rm -rf .git/modules/"$2" || true
-    # git rm --cached "$2" || true
+    rm -rf .git/modules/"$2" || true
+    git rm --cached "$2" || true
+
+    # Save version
+    save-git-folder
 }