I’d give anything just to get a few basic merge modes. For example “this file can treat two one line additions as unordered”.
So any shared append-only file (a change log, an enumeration,…) doesn’t automatically conflict.
Syntax aware diffing would be great too, but I’d take something much simpler. For syntax aware stuff I’d love something that could tell semantic changes from noise.
So any shared append-only file (a change log, an enumeration,…) doesn’t automatically conflict.
Syntax aware diffing would be great too, but I’d take something much simpler. For syntax aware stuff I’d love something that could tell semantic changes from noise.