From 2307403fb5e6d5490cea62fdc332a07056713c7f Mon Sep 17 00:00:00 2001 From: ivan-boikov Date: Sun, 18 Aug 2024 14:04:33 +0200 Subject: Autoswitch to patches on merge fail --- patches/dwmpatch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches/dwmpatch b/patches/dwmpatch index 2dc0575..91f3e79 100755 --- a/patches/dwmpatch +++ b/patches/dwmpatch @@ -31,7 +31,7 @@ git branch -D patched git checkout -b "patched" for patchfile in *.diff; do - apply_patch "$patchfile" || exit + apply_patch "$patchfile" || (git switch "patches" && exit) git switch -q "patched" done -- cgit v1.2.3