Comment by bob1029
13 hours ago
In theory it should merge well. The only actual newline is at the end of the physical line. Everything else is escaped in the JSON string.
13 hours ago
In theory it should merge well. The only actual newline is at the end of the physical line. Everything else is escaped in the JSON string.
But auto merge would have to decide the order when resolving and it can't do it without custom merge.
[dead]