Dataverse + Git Pull and Conflict Resolution

In the previous post we looked at the basics of integration Dataverse with Azure DevOps Git repositories. In this post we’ll look at pulling changes into your instance and conflict resolution.

One of the exciting new features introduced as part of Dataverse’s Native Git integration is the ability to pull changes from your Git repository and update your environment with the latest modifications. This feature enables code-first development, where the code repository—not the Dataverse instance—becomes the source of truth.

Pulling Changes

In the first part of the example video, I demonstrate making a change directly in Azure DevOps, then pulling these changes into my instance to visualize the updates. This process also works if you create a feature branch, update the code using your preferred IDE, and submit a pull request to the development branch before pulling the changes into your instance.

Handling Conflict Resolution

But what happens if there are conflicting changes between your environment and source control? The product team has introduced a basic conflict resolution capability that allows you to choose which changes take precedence, as demonstrated in the second part of the video. For more complex conflicts, it’s usually best to resolve them within a feature branch before pulling the finalized version.

Rami Mounla