Hello. In this short video, I'll show
you how to resolve conflicts in Visual Studio related to
your Microsoft Dynamics 365 for Finance and operations code.
After installing a new version of the baseline model or
applying a hot fix your model elements may have conflicts
after a code upgrade.
The conflicts will have an exclamation point next to the
element when you view them in the Solution Explorer.
This is the vendor table form.
In the designer, type cf: and you'll see all
the conflicts on this particular form.
The init method has code conflicts,
there are 3 parent not found conflicts, and there is
a property conflict on the address books control.
Let's start by resolving the property conflict.
Right click the property and select resolve property conflicts.
Your value is your current customization,
their value is the current baseline, and the original value
is the value from dynamics AX 2012
R3 in this example.
Select your value, then select OK.
The designer will now clearly indicate that the conflict has
been removed.
Now let's go to the init method and resolve the
code conflict. Right click
the method and then select resolve code conflicts.
Here, I'm showing the vertical view of the code merge
tool.
The left pane contains the application suite baseline code,
the right pane contains your customizations, and the middle
pane is a 3 way merge with the original code
before the upgrade.
You can compare your current customization to the original code.
It allows you to inspect the original intent of your
customizations.
To do this go back to the merge tool, go
to a conflict, and select the version of the code
that you want to include in your merged results.
In this case, I select the baseline version to remove
some customizations.
I will also add some custom code to the merged
window.
When I'm satisfied with the merged code I select accept merge
then select yes to mark all conflicts on this method
as resolved.
The conflict indicator on the init method has been removed.
We still have conflicts of type parent
not found. These are customizations that belonged to parent nodes
that have been deleted during the last code update.
If this conflict node refers to a form control,
you can drag it to a new parent control in
the form design.
You can also ignore these conflicts.
I will now close the solution and demonstrate another cool
feature.
At any point you can create a project that contains
all conflicting elements of a particular model.
Let me show you how.
From the Dynamics AX7 menu,
which is the Dynamics 365 menu today,
go to addons and select create project from conflicts.
In the create project from conflicts window, select app suite
customization.
Then select create project. Review the information in the new
project window and then select OK.
This is a useful feature,
especially after applying a hotfix or a baseline code update
to your application.
For more information about Finance
and Operations, visit the documentation
on docs.microsoft.com. Thanks for watching.
