From 5a6982e09308da8ae10b6d7a53e9307b09d29cc0 Mon Sep 17 00:00:00 2001
From: Thulinma <jaron@vietors.com>
Date: Thu, 23 Sep 2021 10:16:45 +0200
Subject: [PATCH] Auto-stage after minimize, continue rebase if no conflicts

---
 embed/minimize_internal.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/embed/minimize_internal.sh b/embed/minimize_internal.sh
index 4890925f..c667158e 100755
--- a/embed/minimize_internal.sh
+++ b/embed/minimize_internal.sh
@@ -60,3 +60,10 @@ echo "  Minimizing CSS..";
 #fi
 echo "  Done.";
 echo "Done.";
+git add min
+echo "Staged."
+CONFLICTS=`git diff --name-only --diff-filter=U`
+if [ -z "$CONFLICTS" ] ; then
+  git status | grep "rebase in progress" > /dev/null && echo "No more conflicts; continuing rebase!" && git rebase --continue
+fi
+