you’re right, when a merge conflict happens it drops you in “detached head” and writes a diff into your files which even when modified away require you to issue a special command to continue.
Its actually worse than interactive rebase.
“detached head” and “rebase” aren’t meaningful verbs to normal people… when all you want is to save a working version