[masklinn]

> Surely we can do better than this? A tool being powerful should be no excuse for it having footguns!

Of course we can but they all lost the vcs wars so we’re left with git, a chainsaw you can’t shut down with hooked spikes bolted to the handle and an old “handle with care” sticker long gone unstuck and slipped under one of the shop’s cabinets.

[leokennis]

Fantastic analogy.

Personally I am not interested to learn "proper git". It's plumbing and not an end goal.

When I start working on something, I do a pull and then create a branch. Then I make edits to the files I need and save a copy of them locally.

If then something goes awry with my commit/push/MR/whatever, I delete the repo, clone it, create a new branch, using human intelligence re-apply my changes from the local copies and try again.