Re: [PATCH v4 0/2] MR9217: dlls/twain_32: Fix segfault when application unloads and reloads twain_32.dll

[Alfred Agrell (＠Alcaro)]

On Thu Oct 30 19:27:25 2025 +0000, Esme Povirk wrote:
> Can you move the comment fixes to the first commit, which added the
> comments, please?
> The easiest way to do this is likely
> - Run `git rebase -i`, marking the first commit as edit
> - Use `git restore -SW --source=my-tain_unload_fix
>
> dlls/twain_32/dsm_ctrl.c` to stage the current version of this file.
> - `git commit --amend` to update the commit.
> - `git rebase --continue` to finish the rebase.

Personally I'd follow a different checklist:
- Open text editor, revert the comment changes, amend the twain commit
- Redo the comment changes (probably via text editor undo), in a separate commit, with a commit message like 'to sane'
- rebase -i
- Swap the latter two commits, and mark the comment one as fixup

Mine needs a bit more text editor work, but fewer long git commands; the result will be the same. Pick your favorite.