[mdaniel]

this may not help you, but JetBrains IDEs have "local history" which addresses many of those concerns, including applying tags to meaningful points in time: https://www.jetbrains.com/help/idea/local-history.html

[TylerE]

That has saved me so much time over the years. Makes quick experimentation totally painless.