I suddenly figured out how GIT-style branching and git-rebase are supposed to work. Now I’m actually having fun resolving merge conflicts, and keeping a bunch of extra branches lying around in my repository with stuff I’m not ready to release yet. I want more conflicts to resolve, just so I can run git-update-index and
git-am -3 --resolved some more. Whee!
…Right, I’ve just officially gone insane with joy at having a sane and distributed source-code management system.