Azure DevOps – Tips and Tricks – 6 – Resolve Merge Conflicts using Pull Request Merge Conflicts Azure DevOps Extension

In this article, we are going to learn how to resolve git merge conflicts within Azure DevOps by using an Azure DevOps Marketplace extension called Pull Request Merge Conflicts.

Scenario

As an Engineer, everyone of us would have used some git supported IDEs like Visual Studio, Visual Studio Code etc to create branches to work on the Task assigned.

Advertisements

During this process, when you would like to merge your branches with long-living branches (ex: develop/main/master), you would have noticed Merged Conflicts (as shown below) and you leveraged the IDE to resolve the Merge Conflicts.

Azure DevOps – Tips and Tricks – 6 – Resolve Merge Conflicts using Pull Request Merge Conflicts Azure DevOps Extension – Conflicts

If the conflicts are complex, then the IDEs should be used. However, if the conflicts are very simple then it may be time consuming to resolve the conflicts in the IDEs.

Advertisements

Today, in this article, we are going to learn a Tip on how to resolve the conflicts directly within the browser using Azure DevOps market place extension called Pull Request Merge Conflicts.

Solution

Azure DevOps Market Place supports 1000+ extensions. In this article, we are going to learn how to install extensions to Azure DevOps Organization and use the same with in the Pull Request User Interface.

Advertisements

Installation of the Pull Request Merge Conflicts extension

Navigate to your Organizational settings by clicking on the Organization Settings link as shown below.

Azure DevOps – Tips and Tricks – 6 – Resolve Merge Conflicts using Pull Request Merge Conflicts Azure DevOps Extension – Select ADO Organization

Now, as shown below click on the Extensions to view all the extensions available in the current Organization.

Azure DevOps – Tips and Tricks – 6 – Resolve Merge Conflicts using Pull Request Merge Conflicts Azure DevOps Extension – Select ADO Organization – Extensions

You will see all the available extensions. My current view is empty as I haven’t installed anything yet. As shown below click on Browser marketplace to search for extensions.

Advertisements
Azure DevOps – Tips and Tricks – 6 – Resolve Merge Conflicts using Pull Request Merge Conflicts Azure DevOps Extension – Select ADO Organization – Extensions Listing

You will be navigated to the marketplace where you can search for Pull Request Merge Conflict as shown below.

Azure DevOps – Tips and Tricks – 6 – Resolve Merge Conflicts using Pull Request Merge Conflicts Azure DevOps Extension – Select ADO Organization – Search Extensions
Advertisements

Select the first item in the search results as shown below

Azure DevOps – Tips and Tricks – 6 – Resolve Merge Conflicts using Pull Request Merge Conflicts Azure DevOps Extension – Select ADO Organization – Select Extensions

In the Pull Request Merge Conflicts page, click on Get it Free button to start the initiation of the download / installation as shown below.

Azure DevOps – Tips and Tricks – 6 – Resolve Merge Conflicts using Pull Request Merge Conflicts Azure DevOps Extension – Get It Free

You will be taken to a page where you can choose the Organization in which you want to install the extension as shown below.

Advertisements
Azure DevOps – Tips and Tricks – 6 – Resolve Merge Conflicts using Pull Request Merge Conflicts Azure DevOps Extension – Select ADO Organization

If you have appropriate administrator privileges you can install the extension using the Install button. Otherwise, your request will be forwarded to the Administrator for installation of the extension.

Advertisements

Once you click on Install button, the Pull Request Merge Conflict Extension will be available in your Organization Extensions as shown below.

Azure DevOps – Tips and Tricks – 6 – Resolve Merge Conflicts using Pull Request Merge Conflicts Azure DevOps Extension – Available Extensions

Once the extension is installed, you can navigate to the Pull Request and you can view a new tab called Conflicts as shown below.

Azure DevOps – Tips and Tricks – 6 – Resolve Merge Conflicts using Pull Request Merge Conflicts Azure DevOps Extension – Pull Request Conflicts tab

Clicking on the Conflicts button you can see a new page where you can view the conflicts between the source and Target branches as shown below.

Azure DevOps – Tips and Tricks – 6 – Resolve Merge Conflicts using Pull Request Merge Conflicts Azure DevOps Extension – Pull Request Conflicts Resolution

That’s it. You can now resolve the conflicts using this page.

Advertisements

Summary

In this article, we have learnt how to install a Custom Extension from the Azure DevOps Marketplace and also learnt how to resolve the conflicts during the process of the Pull Request.

Do you like this article? If you want to get more updates about these kind of articles, you can join my Learning Groups

WhatsApp

Telegram

Advertisements

Leave a Reply

Fill in your details below or click an icon to log in:

WordPress.com Logo

You are commenting using your WordPress.com account. Log Out /  Change )

Twitter picture

You are commenting using your Twitter account. Log Out /  Change )

Facebook photo

You are commenting using your Facebook account. Log Out /  Change )

Connecting to %s