I have this in a script:
set -e; base="remotes/origin/dev"; git checkout --no-track -b "$new_branch"; git rebase "$base";
on occasion, there are conflicts of course, and what happens is that git rebase exits with 1, and so the script aborts/exits early.
So my automated script doesn't work if there are conflicts, which is frequent enough that it defeats the purpose.
My question is, is there some way to suspend the script upon a non-zero exit code, and then resume the script upon a signal or something? Something like this:
git rebase "$base" || suspend --until x;
so in some other terminal I can resolve stuff and then when I am done in the current terminal I could resume? Something like that?