alt Hacker Newsthat’s not guaranteed to work. Other parts of the CodeBase that didn’t conflict could depend on the discarded code.
Replies
dingnuts • yesterday at 5:24 PM
[dead]
that’s not guaranteed to work. Other parts of the CodeBase that didn’t conflict could depend on the discarded code.
[dead]
The point is that the merge conflict was resolved, regardless of whether there was a working product at the end. Which there apparently isn’t.