2 ms·
That's good if the exact same conflict reoccurs, but how often does that happen? What would be far better would be a syntax-aware version control system that kn
by oneeyedpigeon 10y ago
That's good if the exact same conflict reoccurs, but how often does that happen? What would be far better would be a syntax-aware version control system that knows about HTML attributes and understands how to combine two separate additions of HTML attributes.
- evincarofautumn 10y agoThat would be an improvement, although you’d still need human intervention sometimes. Even structurally sound merges can produce semantically wrong results, because diffs aren’t enough to reconstruct a correct history in all cases.