sgeo-7.1.10 alternate strategy 2.2

humbletim · Oct 13, 2024 · a66c0d1 · a66c0d1
1 parent 01a9012
commit a66c0d1
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/sgeo-7.1.10/000.bash b/sgeo-7.1.10/000.bash
@@ -20,6 +20,7 @@ gha-cache-restore $cache_id-repo-0000 repo/viewer || (
       # ... blindly copy conflicting files from manually patched work tree:
       # tar -C ../Fixed -cf - `git status|grep both|sed -e 's@both modified:@@;'`  | tar xf -
       patch -p1 < $nunja_dir/VR_Sgeo_2024.7.1.10.mergeconflict-fixes.patch
+      git add -u
       git -c user.email=CITEST -c user.name=CITEST commit -m "VR_Sgeo_2024.7.1.10 locally patched"
     }