"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/ …
@skamille what does your code review process look like? Do you use a phabricator-like tool, or try to use GitHub without branches?
-
-
@avibryant I mean we end up using gh which isn't ideal. I really hate the fact that git is so branch focused -
@avibryant If you expect your team to be checking in at least every day though that ensures that you don't have long-lived branches for PR -
@skamille so, trying to understand the workflow. Ideal is start a branch in the morning, try to get it in a PR, reviewed, and merged by EOD? -
@avibryant I think you can also write code to master and then branch and apply the change right before you need the PR via various magics -
@skamille yeah, Etsy has a review tool that does exactly that. We're experimenting a bit with@phabricator which is geared to that workflow. -
@avibryant The real problem truth be told for us isn't so much the existence of a branch since we have many codebases, rare merge conflicts -
@avibryant but that I want people writing code that can be released to prod at any time which as you know requires small frequent changes -
@skamille@avibryant to what end do you want this? Not sure it makes sense without some bigger desire. - 2 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.