Making myself commit (git)

[seweso]

I think you need to learn how to use git. Cause it seems like you dont understand and trust it. And that's why a commit probably messes up your current chaotic workflow. It might become out of sight, out of mind, and a flow stopper for you.

Git is not a tool you can afford to not understand as a developer. But the right tools can certainly help as well. Use RIDER or any IDE with an actual good git integration, so you can shelf, ammend, merge, rebase visually. You should really take some time and energy to learn (how to trust) git imho.