Resolve your GIT pull request conflicts within Azure DevOps

Dynamics 365 ERP - Development

D365F&O developers are transitioning to git for source control due to its flexibility over TVSC.
Previously, conflicts in PRs required manual merging in Visual Studio, leading to time-consuming processes.
Microsoft has provided an extension in Azure DevOps to merge conflicts within the platform.
The extension allows developers to merge conflicts directly in a new tab named "Conflicts" in the PR.
While the tool has room for improvement, it can save time for the majority of conflicts that are simple and easy to resolve.
Developers can choose to merge conflicts for the entire file or manually copy and paste different parts of the code.
The extension is especially useful for conflicts that involve labels and straightforward changes.
Overall, the Azure DevOps extension can streamline the conflict resolution process for developers working on D365F&O projects.

Registered users can view the full text for FREE!