| > Backups can be made independent of source control. They can be, but it's ~hard to do it in a way that lines up with saving all your work, and you miss out on conveniences like the reflog (eg what was the state of _this_ branch half an hour ago?) Zfs snapshots can do it if they're manual or ~minutes apart and automatic, but that's a pretty blunt tool for this IMO. > In experience, it's actually more time consuming to restructure an existing set of commits [...] That's fair, but you _can_ just do that. If you have the commits in the first place, you have the choice. 'git reset --soft master' for example is "I don't want those commits on this branch anymore, but I want the final changes to rework into new commit(s)". I'd say about half the time I nuke the commits, half the time I rework them or they were just good enough already. Sounds like you have a workflow that works for you though, just throwing out ideas in case they help. > I am aware of it, but I'm not a fan of the menu based approach. Agreed, it's sometimes tedious. I'll look into the way you do it, seems like for larger ~features your way might be less annoying. |