Having fun with git. And by “fun” I mean too many branches.