Microsoft Dynamics AX (Archived)

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

(0) Share

Report

Posted on by Community Member

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

*This post is locked for comments

I have the same question (0)

All responses (8)

Answers (0)

Martin Dráb 237,817 Most Valuable Professional on at

Like (0)

Report

I saw exactly this error if I accidentally changed the same AOT project from two AX clients and AX wasn't able to reasonable merge the changes. I did what I was asked - refreshed the project and checked whether everything is all right.

In your case, one process making changes to AOT is the synchronization, but I can't say what are the conflicting changes.

Was this reply helpful? Yes No
Nvr 30 on at

Like (0)

Report

i had to deal with the sam error , one of my coworker suggested to checkout the objects in the synchronization log.

you have to click clean all.,that will remove the lock on the files so you can check out first. and undo checkout .

try and see.

Was this reply helpful? Yes No
SomuAx2012 1,235 on at

Like (0)

Report

I got this error and my sync log is not complete for all items. I have no clue about the object that is causing the error.

Please help

Was this reply helpful? Yes No
Dick de Jong 9 on at

Like (0)

Report

Dear Narayan, I faced the same issue and tried to find out what reason is. I have not 100% clarity yet, but in my case it has to to with projects (shared projects). I restored a somewhat older db and after that I tried to bring it in sync with latest status from TFS (forced sync) but it failed and we had cleaned up the projects (removed empty nodes, etc) and I feel that causes the inconsistency now .. it cannot merge projects properly.

It is already an old post, but for somebody who may encounter this .. and I will try to sort out in more detail and once done, post an update.

Dick

Was this reply helpful? Yes No
Suggested answer

keoma 32,729 on at

Like (0)

Report

hi,

have a look at:

dynamicsuser.net/.../354512.aspx

dynamicsaxroad.blogspot.de/.../tfs-sync-error-conflict-encountered.html

Was this reply helpful? Yes No
Joris dG 17,775 on at

Like (0)

Report

Do you have any code checked out when you do the sync?

Was this reply helpful? Yes No
Dick de Jong 9 on at

Like (0)

Report

Jonathan's suggested solution is the answer. However in the UI (when you dont run through debugger) i did not see the message. but in debugger i got the GUID that was causing the conflict.

For me it is solved. Thanks!

Was this reply helpful? Yes No
keoma 32,729 on at

Like (0)

Report

Please verify the satisfying answer(s).

Was this reply helpful? Yes No