Dealing with merge conflicts in features with multiple complex exportables, such as views, can be nearly impossible. Interpreting even a clean diff of serialized objects can be harrowing.

Proposed resolution

The problem could be lessened significantly by keeping each exportable in its own file--just like CMI does with YAML files in D8. Since the result would likely be a proliferation of files in most cases, it would probably be desirable to create sub-directories for each exportable type.

Remaining tasks

Everything. :)

Note: It's only fair to say that I'm creating this issue because I think it represents a valuable improvement, but I won't be able to contribute to the accomplishment of it at present.

User interface changes


API changes



This feature request has been asked before I think. May have been marked won't fix.