Answers: <p>I had this problem too, coming from github where you can usually resolve text file changes in browser.</p>
  <p>On your local repo, you want to get the latest then reverse-merge, so in your case</p>
  <pre><code>// Precursor to ensure your local is the same as origin
  git pull master
  git checkout feature/ENGA-2514
  git pull feature/ENGA-2514 
  
  // include all of the other branches changes into yours. 
  git merge master 
  
  // This is where you'll be able to resolve the conflicts locally 
  // and commit the merge into feature/ENGA-2514
  
  git push feature/ENGA-2514
  </code></pre>
  <p>Then your branch wont conflict with master in devops, since youve just merged master into your branch.</p>
  
Answers: CC BY-SA 4.0
Answers: 2021-10-27T14:48:18.687Z
Answers: hey @Jono, we tend to do the same, but once we do, we get a warning on that pull request "Multiple merge base detected. The list of commits displayed might be incomplete." I wondering if you get the same message? Interestingly, if we do the rebase and then force push, this warning doesn't come up. But I always thought merge is normally preferred over rebase?
Answers: andkorsh
Answers: CC BY-SA 4.0
Answers: 2022-07-22T12:40:54.800Z
Answers: Won't this merge `master` into `feature/ENGA-2514`? What if I don't want to merge all of `master`'s commits into `feature/ENGA-2514`?
Answers: somethingRandom
Answers: CC BY-SA 4.0
Answers: 2021-03-08T23:28:54.763Z
Answers: 2021-03-08T23:28:54.763Z
Answers: Jono
Answers: <p>I am not sure this tab appears 100% of the time, you still have to merge some cases locally, but you can merge <em>some</em> PRs without any extensions in latest UI update.</p>
  <p><a href="https://i.sstatic.net/kO3CZ.png" rel="nofollow noreferrer"><img src="https://i.sstatic.net/kO3CZ.png" alt="merge tool" /></a></p>
  
Answers: CC BY-SA 4.0
Answers: 2021-02-25T17:52:13.290Z
Answers: It seems this extension does not have checkboxes to pick left or right side on specific conflicts, so you have to manually correct them in the bottom pane. Or pick the entire left/right side.
Answers: Brain2000
Answers: CC BY-SA 4.0
Answers: 2022-04-22T17:12:59.057Z
Answers: It definitely doesn't show all the time.  I have a conflict right now in a project merge attempt that doesn't present that tab for "conflicts"
Answers: David Saintloth
Answers: CC BY-SA 4.0
Answers: 2020-11-08T05:43:16.887Z
Answers: 2020-11-08T05:43:16.887Z
Answers: Yehor Androsov
Answers: <p>For me, I cannot resolve these conflicts.</p>
  <p><strong>To PREVENT THEM:</strong></p>
  <pre><code>  i) Make backups outside the folder system for the repository
  
   ii) Totally delete your 'local' folder for the repository.  (Seems
       counterintuitive, but it is all that works for me).  
  
  iii) Re-load 'local' folder from the web-repository.
  
   iv) Eventually, check-in, then it will work.
  
    v) Repeat step i for next time.
  </code></pre>
  
Answers: CC BY-SA 4.0
Answers: 2020-11-24T20:23:37.123Z
Answers: 2020-11-24T20:23:37.123Z
Answers: JosephDoggie
Answers: <p>Pull/Check out the branch with these merge conflicts.
  Edit the file with reported merge conflicts locally.
  Push the changes and it will be resolved.</p>
  
Answers: CC BY-SA 4.0
Answers: 2022-01-05T13:01:50.720Z
Answers: Your answer could be improved with additional supporting information. Please [edit] to add further details, such as citations or documentation, so that others can confirm that your answer is correct. You can find more information on how to write good answers [in the help center](/help/how-to-answer).
Answers: Community
Answers: CC BY-SA 4.0
Answers: 2022-01-05T08:58:26.057Z
Answers: 2022-01-05T08:58:26.057Z
Answers: Justas
Answers: <p>Try this solution: <a href="https://marketplace.visualstudio.com/items?itemName=ms-devlabs.conflicts-tab" rel="noreferrer">Pull Request Merge Conflict Extension</a>. It helps to resolve conflicts inside the pull request page.</p>
  
Answers: CC BY-SA 4.0
Answers: 2019-11-25T16:51:15.450Z
Answers: 2019-11-25T16:51:15.450Z
Answers: Shamrai Aleksander
Body: <p>I have followed the instructions on command line:
  <a href="https://docs.microsoft.com/en-us/azure/devops/repos/git/merging?view=azure-devops&amp;tabs=visual-studio" rel="noreferrer">https://docs.microsoft.com/en-us/azure/devops/repos/git/merging?view=azure-devops&amp;tabs=visual-studio</a></p>
  
  <p><a href="https://i.sstatic.net/fouVZ.png" rel="noreferrer"><img src="https://i.sstatic.net/fouVZ.png" alt="enter image description here"></a></p>
  
  <p>all I want to do is resolve this merge conflict its complaining about.</p>
  
  <p>To be clear, I have done a <code>git pull</code>, it says <code>Already up to date.</code></p>
  
  <p>I also tried:</p>
  
  <pre><code>git pull origin feature/ENGA-2514
  From ssh.dev.azure.com:v3/nfib/NfibEnterprise/engage.mobile
   * branch                feature/ENGA-2514 -&gt; FETCH_HEAD
  Already up to date.
  </code></pre>
  
  <p>I have also tried:</p>
  
  <pre><code>git log --merge
  fatal: --merge without MERGE_HEAD?
  </code></pre>
  
  <p>Where is this elusive merge conflict?</p>
  
Comments: CC BY-SA 4.0
Comments: 2021-03-05T00:27:29.997Z
Comments: I found it impossible to do this on the web UI, I had to do it in Visual Studio instead. As far as I could tell there were zero options in the web UI for resolving conflicts.
Comments: SendETHToThisAddress
Tags: <git><azure-devops>
Title: How to resolve merge conflicts in Azure DevOps current UI
UserDisplayName: Daniel
ThreadText: # How to resolve merge conflicts in Azure DevOps current UI
  
  (Asked by: username_0 on 2019-11-22)
  
  I have followed the instructions on command line:
  <https://docs.microsoft.com/en-us/azure/devops/repos/git/merging?view=azure-devops&tabs=visual-studio>
  
  [![enter image description here](https://i.sstatic.net/fouVZ.png)](https://i.sstatic.net/fouVZ.png)
  
  all I want to do is resolve this merge conflict its complaining about.
  
  To be clear, I have done a `git pull`, it says `Already up to date.`
  
  I also tried:
  
  ```
  git pull origin feature/ENGA-2514
  From ssh.dev.azure.com:v3/nfib/NfibEnterprise/engage.mobile
   * branch                feature/ENGA-2514 -> FETCH_HEAD
  Already up to date.
  
  ```
  
  I have also tried:
  
  ```
  git log --merge
  fatal: --merge without MERGE_HEAD?
  
  ```
  
  Where is this elusive merge conflict?
  
  **Tags:** git, azure-devops
  
  > **Comments:**
  > **username_1**: I found it impossible to do this on the web UI, I had to do it in Visual Studio instead. As far as I could tell there were zero options in the web UI for resolving conflicts.  
  
  ---
  
  ## 5 answers
  
  ### Answer by username_11 on 2019-11-25. Score: 15 | Accepted answer
  
  Try this solution: [Pull Request Merge Conflict Extension](https://marketplace.visualstudio.com/items?itemName=ms-devlabs.conflicts-tab). It helps to resolve conflicts inside the pull request page.
  
  
  ---
  
  ### Answer by username_2 on 2021-03-08. Score: 7
  
  I had this problem too, coming from github where you can usually resolve text file changes in browser.
  
  On your local repo, you want to get the latest then reverse-merge, so in your case
  
  ```
  // Precursor to ensure your local is the same as origin
  git pull master
  git checkout feature/ENGA-2514
  git pull feature/ENGA-2514 
  
  // include all of the other branches changes into yours. 
  git merge master 
  
  // This is where you'll be able to resolve the conflicts locally 
  // and commit the merge into feature/ENGA-2514
  
  git push feature/ENGA-2514
  
  ```
  
  Then your branch wont conflict with master in devops, since youve just merged master into your branch.
  
  > **Comments:**
  > **username_3**: hey @username_2, we tend to do the same, but once we do, we get a warning on that pull request "Multiple merge base detected. The list of commits displayed might be incomplete." I wondering if you get the same message? Interestingly, if we do the rebase and then force push, this warning doesn't come up. But I always thought merge is normally preferred over rebase?  
  > **username_4**: Won't this merge `master` into `feature/ENGA-2514`? What if I don't want to merge all of `master`'s commits into `feature/ENGA-2514`?  
  
  ---
  
  ### Answer by username_5 on 2020-11-08. Score: 4
  
  I am not sure this tab appears 100% of the time, you still have to merge some cases locally, but you can merge *some* PRs without any extensions in latest UI update.
  
  [![merge tool](https://i.sstatic.net/kO3CZ.png)](https://i.sstatic.net/kO3CZ.png)
  
  > **Comments:**
  > **username_6**: It seems this extension does not have checkboxes to pick left or right side on specific conflicts, so you have to manually correct them in the bottom pane. Or pick the entire left/right side.  
  > **username_7**: It definitely doesn't show all the time.  I have a conflict right now in a project merge attempt that doesn't present that tab for "conflicts"  
  
  ---
  
  ### Answer by username_8 on 2020-11-24. Score: 1
  
  For me, I cannot resolve these conflicts.
  
  **To PREVENT THEM:**
  
  ```
    i) Make backups outside the folder system for the repository
  
   ii) Totally delete your 'local' folder for the repository.  (Seems
       counterintuitive, but it is all that works for me).  
  
  iii) Re-load 'local' folder from the web-repository.
  
   iv) Eventually, check-in, then it will work.
  
    v) Repeat step i for next time.
  
  ```
  
  
  ---
  
  ### Answer by username_9 on 2022-01-05. Score: 0
  
  Pull/Check out the branch with these merge conflicts.
  Edit the file with reported merge conflicts locally.
  Push the changes and it will be resolved.
  
  > **Comments:**
  > **username_10**: Your answer could be improved with additional supporting information. Please [edit] to add further details, such as citations or documentation, so that others can confirm that your answer is correct. You can find more information on how to write good answers [in the help center](/help/how-to-answer).  
  
  ---
  
  