I often forget that I cannot commit to main (even on my own projects) and struggle with how to recover a workflow without re-cloning and cherry-picking the changes out and adding them back. It appears that the following will do what I want (assuming changes have been made already to main and committed, but not pushed):
With just git:
TODO