You have to fix a lot of merge conflicts. I used this workflow at AWS -- code re... | Hacker News

Hacker Newsnew | past | comments | ask | show | jobs | submit

		shepherdjerred on Nov 17, 2021 \| parent \| context \| favorite \| on: Stacked changes: how FB and Google engineers stay ... You have to fix a lot of merge conflicts. I used this workflow at AWS -- code reviews can take some time, you're writing a lot of code, and you want your CRs to be small. If someone leaves a comment on the CR for the first branch you fix the issue and rebase. It's not fun, but this is the only effective way to do it (that I know of).

treis on Nov 17, 2021 [–]

So are the 10 branches mostly yours then? That seems slightly less crazy.

shepherdjerred on Nov 18, 2021 | [–]

Yup. I rarely even pushed the branches — they’re local branches

Guidelines | FAQ | Lists | API | Security | Legal | Apply to YC | Contact