Always blows my mind how much time we waste talking about Git instead of just using it properly. Cheatsheet: - It's distributed horticulture. Your tools come s

Always blows my mind how much time we waste talking about Git instead of just using it properly. Cheatsheet: - It's distributed horticulture. Your tools come saran-wrapped to the tree. - Rebase flow. Keep your branches linear. - Merge commits are BS - There is no source control problem that rebase, rebase --onto, reset, and reflog can't fix - Topology is everything. Add this to your aliases: https://stackoverflow.com/questions/1838873/visualizing-branch-topology-in-git/34467298#34467298 https://stackoverflow.com/questions/1838873/visualizing-bran... TL;DR: Keep your branches up to date. Feature flags are a huge red flag. Constant conflicts and the inability to have long lived branches is indicative of poor architecture and project layout. Use "rerere" as a bandaid. Why won't anyone think about the release managers.