Is there any way to resolve merge conflicts on the Azure-devops server? The problem I am running into is I am trying to keep my branches isolated to single request/defects. For example, I have Request1 to create a report to show list of purchases and Request2 to show a list of sales. Both will reside in the solution for Accounting. I commit and push and do a pull request. The first one merges into the master fine, but the 2nd gets a conflict because it doesn't have the 1st one in it. Now when this happened in the past I would simply pull the master into my Request2 and do another push/pull request. However, I am now on a project with a gate keeper and it is adding a lot of time to always have this happen. Is there any way to do something like: Resolve merge conflicts section of https://docs.microsoft.com/en-us/azure/devops/repos/git/merging?view=azure-devops&tabs=visual-studio from the server? Usually the only conflict is a report in master that is not in branch, but that is a single XML line. I just want to merge the files and keep the missing line and the new line. This way the Gatekeeper can merge the files without all the back and forth.
1 Answers
There is an extension to resolve Pull Request conflicts on the web. After installed it to your Azure DevOps Server, you could see a Conflicts tab in Pull Request page, then you could resolve conflicts in web site instead of resolve the conflicts in a local clone.
Note: There is an known issue that the new changes to master branch after the Pull Request creation will not be recognized by Pull Request. You need to abandon the current PR then create a new one. For example, there are two PRs in your repo, feature1 to master and feature2 to master. After feature1 merged into master, the existing PR from feature2 to master will not show the feature1’s changes. You need to abandon it and recreate a new PR. And then you could use the Conflict extension to resolve merge conflicts.
Update:
Pull Request could not get the latest master changes automatically when new changes push to master branch. Instead of abandon and reactivate the PR, there is a “Restart merge” option which could get the latest changes of master.
Also you could see the master’s last change time in the conflict tab.
Related