3 ms·
I think rebase is generally the correct approach here. If you've done your own work on top of their old changes, rebase your work on top of their new changes.
by iainmerrick 2y ago
I think rebase is generally the correct approach here. If you've done your own work on top of their old changes, rebase your work on top of their new changes.
- lmm 2y agoThat's possible but it requires a bunch of manual tracking and results in wasted/duplicate effort with people resolving the same conflicts multiple times.