3 ms·
Or you could just rebase component2 when you learn that component1 has been updated on master: * F: (master) Merge branch 'component2' |\ | *
by gwright 7y ago
Or you could just rebase component2 when you learn that component1 has been updated on master:
* F: (master) Merge branch 'component2'
|\
| * E: (component2) Implemented component 2 (now with updated component1)
|/
* C: (master) Refactored component 1's API
|
* A: (master) Base
So we've lost B and D from your example, but who cares about those commits?
- Nullabillity 7y agoThat's easy in the trivial example where nothing else happened in the meantime.