"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/ …
@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 -
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.