How to Resolve Code Merge Conflicts after Upgrading to Dynamics 365 for Finance and Operations

by | Updated July 11, 2018 | Dynamics 365 for Finance and Operations

Once the code upgrade process from Dynamics AX to Dynamics 365 for Finance and Operations has been completed, the code needs some work to resolve the upgrade conflicts.

In Visual Studio, it is necessary to create a project from the conflicts. This process needs to be followed for each model that contains conflicts.

How to create project from conflicts in Visual Studio

1. Select the Dynamics 365 tab, go down to Addins, and click on Create Project from Conflicts


2. Select the model:

Code Merge Conflicts

3. Click Create Project

a. One of two things will happen, if there are no conflicts in that mode you will see a message

Code Merge Conflict

b. The other will ask you to name the new Conflict Project

Code Merge Conflict

Once you have the project created with all the conflicts, the next trick is finding the conflicting elements.

Finding the conflicting elements

To find the conflicting elements, select the View tab, and click on Solution Explorer (Shortcut: Ctrl+Alt+L)

Code Merge Conflicts

Select the first object that you need to work with from the solution exporter.

*Note: Depending on the type of the object, the next steps might be different. The object used in this example is a table.*

When you open the object you will see all of the parts of the object.

Code Merge Conflicts

To find items, you can filter these items by using the search bar at the top of the window. To filter on Conflicts, enter “CF:” into the search bar. This will only show you the conflicting elements in the object. The red arrows in front of the item name identify conflicts.

Code Merge Conflicts

To view conflict, and ignore or resolve it, right click on the object and select the proper action.

Code Merge Conflicts

Once the conflict has been resolved, the [!] that is listed at the end of the element’s name will no longer be displayed. Hopefully, now you know how to resolve code merge conflicts after upgrading to Dynamics 365 Finance and Operations.

Related Posts


Submit a Comment

Your email address will not be published. Required fields are marked *

Upcoming Events


12aug10:00 am10:30 amWhy Levridge Grain? How to Achieve Efficient and Accurate Scale Tickets

12aug12:00 pm1:00 pmThe Three Paths to Dynamics 365 Finance and Supply Chain from Dynamics AX

13aug11:00 am12:00 pmConfab with Stoneridge - Livestream - Inspire Keynote Breakdown

19aug10:00 am11:00 amWhat is Levridge? An Overview of the Ultimate Ag Solution

19aug12:00 pm12:30 pmThe Modern Manufacturer - Death by Safety Stock

27aug12:00 pm1:00 pmConfab with Stoneridge - Livestream - Dynamics 365 2020 Wave 2 Preview


02sep10:00 am10:30 amThe Modern Manufacturer - Cycle Count Management

09sep10:00 am11:00 amWhat is Levridge? An Overview of the Ultimate Ag Solution

16sep10:00 am10:30 amThe Modern Manufacturer - Product Lifecycle Management

30sep10:00 am10:30 amThe Modern Manufacturer - Return Management

About Stoneridge
Stoneridge Software is a unique Microsoft Gold Partner, with emphasis on partner. With specialties in Microsoft Dynamics 365, Microsoft Dynamics AX, Microsoft Dynamics NAV, Microsoft Dynamics GP and Microsoft Dynamics CRM, we focus on attracting the most knowledgeable experts in the field to our team, and prioritize delivering stellar solutions with maximum impact for your business. At Stoneridge, we are deeply committed to your results. Each engagement is met with a dedicated team, ready to provide thorough, tailored, and expert service. Based in Minnesota, we intentionally “step into your shoes,” wherever you are. We focus on what you care about, and develop trusting, long-term relationships with our clients.

Subscribe To Our Blog

Sign up to get periodic updates on the latest posts.

Thank you for subscribing!