Hi,
I am trying to merge branch A with branch B on Team Foundation Server. But I am getting
TF203015: The item $/abc/xyz3.vsmdi has an incompatible pending change.
Neither branch have any pending changes and both compile fine. However while the branch A folder has the xyz3.vsmdi file the branch B doesn't have it. Not sure how to resolve it. Any help is greatly appreciated.
Thanks