"Don't branch" was the hardest culture shift for me at Etsy. I'm still trying to figure out when it's appropriate. https://secure.phabricator.com/book/phabflavor/article/recommendations_on_branching/ …
-
-
@avibryant for me, days to weeks. If you rebase on master regularly, it really doesn’t matter. -
@bgreenlee "long lived branch but rebase on master regularly" is only a solution when you're the only one doing that, right? -
@avibryant no, it works with a small team if you coordinate -
@bgreenlee@avibryant - I actually think the Etsy philosophy is better understood as “branch in code” rather than “no branches”. -
@rafeco@bgreenlee branch-in-code increases cyclomatic complexity, refactoring required to reduce; real-branch complexity reduced by merge -
@rafeco@bgreenlee branch-in-code moves "version control" into code & makes merging manual; two things that git externalizes & automates -
@michael_at_work@rafeco@bgreenlee nice theory, which guarantees a disaster on deploy. Branch in code is the worst way but actually works -
@mcfunley@rafeco@bgreenlee which recent#linux (kernel) deployment has been a guaranteed disaster? Though: if you can't branch well, don't - 3 more replies
New conversation -
Loading seems to be taking a while.
Twitter may be over capacity or experiencing a momentary hiccup. Try again or visit Twitter Status for more information.