Quantcast
Channel: Microsoft Dynamics AX Forum - Recent Threads
Viewing all articles
Browse latest Browse all 73760

Team foundation server (TFS) issue - force sync throws error" Conflict encountered during automatic merge of changes."

$
0
0

Hi everyone, I just want to ask what is the desired steps to fix problem during "Force Sync".

Here are the steps I did:

1-Restored the DB and model DB

2-Configured TFS with AX 2012 R2 CU7 and VS 2012

3- When I try to do  force Sync from TFS,I have the problem of " Conflict encountered during automatic merge of changes. Please check your modifications." clicked "OK" to let it continue (seems no other choices here?)

Can any one let me know What is the  "conflict" it's referring to? And how to fix the problem?

Thank you,

Narayan


Viewing all articles
Browse latest Browse all 73760

Trending Articles



<script src="https://jsc.adskeeper.com/r/s/rssing.com.1596347.js" async> </script>