Git pull --rebase until it hurts
Am I the only one here who's frustrated by this entire discussion? I've a very strong underbelly feeling that we should simply build tooling that make these entire discussions unnecessary.<p>I don't mean a non-sucky CLI for git. I mean something more fundamental, something that connects with common programming workflows so well that we can stop discussing the tool altogether.<p>I'm not sure what that would be, but I hope that one day someone smarter than me will invent it.