From dc4b5dc6bfcf4e652de129ff53a7332a86ad10ed Mon Sep 17 00:00:00 2001
From: Gerd Aschemann <gerd@aschemann.net>
Date: Sun, 21 Jan 2024 18:59:17 +0100
Subject: [PATCH] Make reverting to old branch more robust

by
- ignoring merge abort problems
- stashing/popping local changes to clean up branches
---
 scripts/review/rollback.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/scripts/review/rollback.sh b/scripts/review/rollback.sh
index 671427ee26..3365241386 100755
--- a/scripts/review/rollback.sh
+++ b/scripts/review/rollback.sh
@@ -2,11 +2,13 @@
 
 : "${REVIEW_BASE_BRANCH:=main}"
 
-git merge --abort
-git checkout "${REVIEW_BASE_BRANCH}"
-
 set -euo pipefail
 
+git merge --abort || echo "Skipping merge rollback"
+git stash save
+git checkout "${REVIEW_BASE_BRANCH}"
+git stash pop
+
 if ! type -p gh >/dev/null; then
   echo "Please install the 'gh' tool, e.g., via Homebrew: brew install gh" >&2
   exit 1