This is something that we should think about from time to time, and see if there is a way to handle. Probably the bug should be changed to "find a sane way to handle unmergable (binary) files" or something like that.
This is something that we should think about from time to time, and see if there is a way to handle. Probably the bug should be changed to "find a sane way to handle unmergable (binary) files" or something like that.