We work on two machines to create the Telerik-tests. We always do a tfs-getlatest to make sure we have the latest version of the tests. If someone did a checkin, we get a merge conflict on the pages file. We would like to merge the changes, but the file completely changed, so you can't see if the 'auto-merge' is correct. This also happens if someone just opens Telerik and makes no changes. The elements/pages file seems re-ordered.
This makes working together difficult. How should we handle this? Does anyone else have this problem?