@avibryant Really. What was the branching story in Smalltalk?
-
-
-
@peterseibel the widely used DVCS is one I wrote in 2002(?). Each revision is a file w/ full source code archive + tree of parent metadata. -
@peterseibel any two revisions can be merged if you can locate the common ancestor's file; branches are just done via naming convention. -
@peterseibel the model doesn't allow for cherry picking without horrible contortions; the rewrite that fixed this never got traction. -
@peterseibel in practice our workflow at Dabble DB was closest to everyone having a personal public branch they pushed to... -
@peterseibel ... and the constant question was "should I be merging your stuff into my branch yet?"
End of conversation
New conversation -
-
-
@avibryant@kellan v. interested in how you structure code reviews if everyone is committing directly to master vs branch & review on the PR -
-
-
@avibryant@kellan ok so that gels w/ my need to see all files & changes to catch accidental mistakes/errors before code review -
New conversation -
-
-
@avibryant I use feature branches all the time and am doing my best to spread the gospel. -
@bgreenlee how long do they generally live before being merged to master? -
@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@avibryant@bgreenlee A (domain-specific?) git successor could have native support for branches in code. Exciting thought. -
@lsinger@rafeco@bgreenlee I've also wondered idly about allocating traffic to branches instead of using flags. But unworkable I think. - 1 more reply
New conversation -
-
-
@avibryant I mean, I adopted "don't branch" way before Etsy was Etsy and I still don't understand why people want to do it -
@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 - 4 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.