2 ms·
The author glances off another problem in the "Incrementality" section. Assume you have a few projects scaffolded. How do you retrofit any updates you've made t
by CraigJPerry 4y ago
The author glances off another problem in the "Incrementality" section. Assume you have a few projects scaffolded. How do you retrofit any updates you've made to the scaffolding to an existing project that has probably diverged from the original vanilla scaffolding in non-trivial ways?
- verdverm 4y agodiff3 is generally how the problem of a shared base with two child histories that need to be merged is handled. This works on a per file basis, so if you have moved files or functions around, it gets more complicated.