is there a way to move commit out of the way Todo later?
This is what cherry-pick does for me. Now that the work is all done, I can cherry-pick the commits into the new branch in any order I find convenient (and often in an order that causes fewer git conflicts, or no git conflicts to resolve.)
Note that this approach is much stronger if the original commits are fairly focused and purposeful.
In extreme cases, I stop and rebase the new or old branch to clean up the commits before I cherry-pick them onto the same branch.
In essence, all of these techniques are just ways for me to very slowly and methodically organize thoughts, using git.
Also, sometimes it's all too messy and I just copy and paste all the change I need into a fresh clean branch.
Another thing I do is to make plans for Sunday night. Then when I look ahead to the end of the weekend, I have my Sunday night plans to look forward to, and not just work on Monday ahead.
Yeah. That's the part that billionaires and health CEOs should be thinking more about. Plumbers with exceptional jumping ability are being created at a rate that should alarm them, in exchange for amounts of difference on the billionaire's net worth that they'll never even notice.
Social safety nets make everyone win, even the billionaires. We just have an exceptionally stupid crop of billionaires.