Sandy

Sandy

  • NA
  • 823
  • 65.6k

How to merge the code of TFS in 2012 Visual studio.

Oct 9 2017 2:14 AM
I have very large EDMX file and there is a lot of conflict in this file because two team are working on different module and i want to resolve these conflict.
 
Any tool which help me to merge because Visual studio 2012 does not support TFS directly .
 
Thanks in advance. 

Answers (1)