|
|
|
|
|
|
by seba_dos1
1046 days ago
|
|
|
> Resolving rebase conflicts is technically and conceptually much more difficult than resolving merge conflicts The opposite is true: resolving a conflict during a rebase is much easier, as you get to resolve the conflict in the context of a single commit and its parent. In some cases it may end up being more work than resolving a whole merge, but it's much easier to reason about. |
|
|