3 ms·
> But have you ever contested the regular merge algorithm (ort by default) when it did work? Depends on what you mean by 'contested', but yes. You can have "m
by 1718627440 1y ago
> But have you ever contested the regular merge algorithm (ort by default) when it did work?
Depends on what you mean by 'contested', but yes. You can have "merge conflicts", that are even correct as far as the syntax is concerned, but are garbage on a semantic level.
- goku12 1y agoI'm not talking about the conflicts. I'm talking about the hunks that were resolved successfully. Sometimes they're part of successful merges. Sometimes they're part of conflicted merges where some other hunk was in conflict.
- 1718627440 1y agoMe too. A merge can be entirely without merge conflicts and still wrong, because it has (semantic or architectural) "merge conflicts".