commit 739a311cc613e8ef2f293ac06f8fe53d2fbbacc1
author Alex Buynytskyy <alexbuy@google.com> Wed Nov 02 20:01:30 2022 +0000
committer Alex Buynytskyy <alexbuy@google.com> Thu Nov 03 14:43:58 2022 +0000
tree 30ba5e04d674776c9fc98a30c40d428422fe05c3
parent 29c6a7502521315b56aee6cb066bc1dd4fae6014

Better cleanup and revert.

Bug: 243966946
Test: run locally
Change-Id: I09f7cb19bb7f97d807a75189bf75e7c2fd25edee

finalize-cleanup.sh

diff --git a/finalize-cleanup.sh b/finalize-cleanup.sh
index efa2707..e3bca63 100755
--- a/finalize-cleanup.sh
+++ b/finalize-cleanup.sh
@@ -9,7 +9,7 @@
     repo selfupdate
 
     repo forall -c '\
-        git checkout . ; git clean -fdx ;\
+        git checkout . ; git revert --abort ; git clean -fdx ;\
         git checkout @ ; git b fina-step1 -D ; git reset --hard; \
         repo start fina-step1 ; git checkout @ ; git b fina-step1 -D ;'
 }

finalize-step-1.sh

diff --git a/finalize-step-1.sh b/finalize-step-1.sh
index 4e3e0c4..3848d50 100755
--- a/finalize-step-1.sh
+++ b/finalize-step-1.sh
@@ -8,11 +8,11 @@
 
 function revert_local_changes() {
     repo forall -c '\
-        git checkout . ; git clean -fdx ;\
+        git checkout . ; git revert --abort ; git clean -fdx ;\
         git checkout @ ; git b fina-step1 -D ; git reset --hard; \
         repo start fina-step1 ; git checkout @ ; git b fina-step1 -D ;\
         previousHash="$(git log --format=%H --no-merges --max-count=100 --grep ^FINALIZATION_STEP_1_SCRIPT_COMMIT | tr \n \040)" ;\
-        if [[ $previousHash ]]; then git revert --no-commit $previousHash ; fi ;'
+        if [[ $previousHash ]]; then git revert --no-commit --strategy=ort --strategy-option=theirs $previousHash ; fi ;'
 }
 
 function commit_changes() {