Version: 2.1.0.678
We're having a constant struggle with source control and Architect.

The meta files and xds file, contently shift around json objects making it impossible for automated merge tools to successfully/accurately merge files between developers in source control, specificity TFS in this case, but I've also tried Beyond compare 2, and it can't either, things are just moved around to much.

It happens from things as simple as just adding a new Component of sorts, be it a controller, model, store, view.

If there's a private email I can send example xds files to, i'd be glad to share.