commit ac60bcdaaf74a5c835072ace98bbdf5815bfbf27
author Alex Buynytskyy <alexbuy@google.com> Thu Nov 03 18:18:23 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 03 18:18:23 2022 +0000
tree dc4a1cc08a3454f15620b7958798d48c88d22d42
parent 4b9babc12cd8b616f13c7fa511e60d441d449438
parent 739a311cc613e8ef2f293ac06f8fe53d2fbbacc1

Merge "Better cleanup and revert."

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() {