• Sean McGivern's avatar
    Handle non-UTF-8 conflicts gracefully · 44eb3197
    Sean McGivern authored
    These can't be resolved in the UI because if they aren't in a UTF-8
    compatible encoding, they can't be rendered as JSON. Even if they could,
    we would be implicitly changing the file encoding anyway, which seems
    like a bad idea.
    44eb3197
resolve_conflicts.md 1.84 KB