I know, Git is a mess. But, since we're stuck with it, we may as well try to learn how it works with resources like this, which aims to lead to some form of Git enlightenment.
My git workflow is minimalist and defensive. I know the fewest possible commands to get my work done, and I work defensively, so I merge and push my feature branch work upstream before merging in the latest. If things go sideways, all I have to do is nuke the folder and try again. I commit as little brain real-estate possible to Git and give it as few opportunities to fuck up my life as possible.
@amoroso After the initial couple weeks of steep learning curve, circa 2008, I have been happy with git and its slightly awkward "porcelain". I started with an intense practical session with some colleagues -- @nebhale will recall -- and then got a better mental model from https://eagain.net/articles/git-for-computer-scientists/ (works for mathematicians too).
(git switch -c was quite an improvement over git checkout -b for creating a new branch.)
Add comment