| ▲ | fzzzy 12 hours ago | ||||||||||||||||
that’s not guaranteed to work. Other parts of the CodeBase that didn’t conflict could depend on the discarded code. | |||||||||||||||||
| ▲ | madeofpalk 11 hours ago | parent | next [-] | ||||||||||||||||
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. | |||||||||||||||||
| ▲ | formerly_proven 12 hours ago | parent | prev | next [-] | ||||||||||||||||
Well they did mention the code doesn't work. | |||||||||||||||||
| |||||||||||||||||
| ▲ | dingnuts 12 hours ago | parent | prev [-] | ||||||||||||||||
[dead] | |||||||||||||||||