Quantcast
Viewing all articles
Browse latest Browse all 9880

How to handle the problem of "Conflict encountered during automatic merge of changes. Please check your modifications."

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- There was something wrong with my dev box. So, I got the database back files from production environment for both business database and model database containing the code (I am using AX 2012 R2)

-2- Restored "business database" from the bak file, overwritten the database on my dev box; Restored "model database" from the bak file, overwritten the database on my dev box;

 

-3- Use force Sync from TFS, 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?)

 

For the problem seen in Step 3, can we know which " conflict" it's referring to? And what is the desired practice to fix the problem?

Thank you,


Viewing all articles
Browse latest Browse all 9880

Trending Articles