Code migration conflict management

(0) Share

Report

Posted on by Community Member Microsoft Employee

Hi,

Is there a way to compare or sneak around the AX 2012 code from VS after a conflict is resolved in D365 for operation?

Let's say, a conflicted object is resolved by partially accepting and rejecting changes from migrated code during a 3-way comparison. Later, if I would like to undo/redo this process, is there a way I can still have a 3-way comparison view for any amendments. Please note, the changes haven't been committed to VSTS.

Thanks.

Dip

*This post is locked for comments

All responses (2)

Answers (2)

Verified answer

Community Member Microsoft Employee on at

Like (0)

Report

RE: Code migration conflict management

Right, looks like undo pending changes for uncommitted code is the only option. Thanks Mohammad.
Verified answer

Basheer17 2,720 on at

Like (0)

Report

RE: Code migration conflict management

If the changes haven't been committed you can undo pending changes and repeat the process. And we can also do Compare and Merge Code from solution explorer by right clicking on any object.