3 ms·
I find most merge conflicts are easy to understand if both authors work together to resolve it.
by james_s_tayler 7y ago
I find most merge conflicts are easy to understand if both authors work together to resolve it.
- autarch 7y agoI would agree that _most_ are easy. But the upper bound for difficulty to understand is quite high. And even if they are easy when both authors work together it'd be even better to _not_ spend two people's time on that. So why adopt a workflow that's guaranteed to maximize merge conflicts?
- rndgermandude 7y agoWhen I work together with people on projects, I make them to agree that nobody other than the author of commits is allowed to resolve merge conflicts, and conflicts must be resolved in the feature/pr branch that is going to be merged into the main branch(es)