News for hackers. Stuff that matters.
Re:How Chromium Works by neikos on Friday September 25, 2015 @03:00PM (#10280002)
I wonder though, there /have/ to be merge conflicts? I suppose you continually rebase on the HEAD of master to keep up to date? So instead of taking care of conflicts at the end of a 'dev cycle' you take care of it in the middle.

Did I understand that correctly?

Re:How Chromium Works by phasmantistes on Friday September 25, 2015 @03:07PM (#10280051)
The difference is that, in our flow, the merge conflicts are on the scale of a a single developer making a single self-contained commit. In a flow with feature branches, the merge conflicts are on a scale of the entire branch conflicting with any other changes made on master.

But yes we also provide tools (https://commondatastorage.googleapis.com/chrome-infra-docs/f...) to make things like rebasing (see git rebase-update) your local branches on top of master easier.