That sounds like the perfect situation to use git worktree.
git worktree
Maybe you resolved the conflict in the wrong way and want to restart after finishing the rebase.
