Answers: <p>Think I figured it out …</p>
  <p>Make sure you are in the branch you are trying to merge. For the example &quot;new_branch&quot; is the new one I made a PR for, which is merging into &quot;dev&quot;</p>
  <pre><code>git branch
  </code></pre>
  <p>Change to the correct branch if you are not in the new_branch branch</p>
  <pre><code>git checkout new_branch
  </code></pre>
  <p>Perform a merge</p>
  <pre><code>git merge dev
  </code></pre>
  <p>Find conflicts / fix</p>
  <pre><code>git conflicts 
  </code></pre>
  <p>My problem was the dev branch had a single file called &quot;create_new&quot; which was old code. The new branch I created had many changes and I created a new folder called &quot;create_new&quot;, the conflict was the folder name. This was why it was so hard to figure out what the problem was.</p>
  <p>Check status that changes will be made on merge</p>
  <pre><code>git status
  </code></pre>
  <p>Commit the changes, this will create a new merge/commit, keep as is and save to push with the merge.</p>
  <pre><code>git commit -a
  </code></pre>
  <p>Now in ADO, the conflict is gone.</p>
  
Answers: CC BY-SA 4.0
Answers: 2022-12-06T16:45:41.107Z
Answers: 2022-12-06T20:37:37.593Z
Answers: 2022-12-06T20:37:37.593Z
Answers: Dave
Body: <p>I have already read
  <a href="https://devops.stackexchange.com/questions/9895/how-to-resolve-merge-conflicts-in-azure-devops-current-ui">How to resolve merge conflicts in Azure DevOps current UI</a> but nothing there helped.
  Also, no, I cannot use &quot;Pull Request Merge Conflict Extension&quot;, I am not the admin of the box, therefore I cannot add extensions.</p>
  <p>ADO shows there is a conflict. However if I get pull the branch I see no conflicts.</p>
  <p>I also tried selecting the file in ADO under &quot;Conflicts&quot; and &quot;Take source <code>&lt;repo&gt;</code>&quot;. After that ADO shows that the conflict is resolved. But when I go back to the PR, the conflict still shows.</p>
  <p>Why am I seeing no conflicts in git, but ADO shows conflicts? How do I fix this?</p>
  
Tags: <azure-devops><git>
Title: Why don't I see conflicts in git, but ADO shows conflicts, and how to fix this?
UserDisplayName: Dave
ThreadText: # Why don't I see conflicts in git, but ADO shows conflicts, and how to fix this?
  
  (Asked by: username_0 on 2022-12-06)
  
  I have already read
  [How to resolve merge conflicts in Azure DevOps current UI](https://devops.stackexchange.com/questions/9895/how-to-resolve-merge-conflicts-in-azure-devops-current-ui) but nothing there helped.
  Also, no, I cannot use "Pull Request Merge Conflict Extension", I am not the admin of the box, therefore I cannot add extensions.
  
  ADO shows there is a conflict. However if I get pull the branch I see no conflicts.
  
  I also tried selecting the file in ADO under "Conflicts" and "Take source `<repo>`". After that ADO shows that the conflict is resolved. But when I go back to the PR, the conflict still shows.
  
  Why am I seeing no conflicts in git, but ADO shows conflicts? How do I fix this?
  
  **Tags:** azure-devops, git
  
  
  ---
  
  ## 1 answers
  
  ### Answer by username_0 on 2022-12-06. Score: 0
  
  Think I figured it out …
  
  Make sure you are in the branch you are trying to merge. For the example "new\_branch" is the new one I made a PR for, which is merging into "dev"
  
  ```
  git branch
  
  ```
  
  Change to the correct branch if you are not in the new\_branch branch
  
  ```
  git checkout new_branch
  
  ```
  
  Perform a merge
  
  ```
  git merge dev
  
  ```
  
  Find conflicts / fix
  
  ```
  git conflicts 
  
  ```
  
  My problem was the dev branch had a single file called "create\_new" which was old code. The new branch I created had many changes and I created a new folder called "create\_new", the conflict was the folder name. This was why it was so hard to figure out what the problem was.
  
  Check status that changes will be made on merge
  
  ```
  git status
  
  ```
  
  Commit the changes, this will create a new merge/commit, keep as is and save to push with the merge.
  
  ```
  git commit -a
  
  ```
  
  Now in ADO, the conflict is gone.
  
  
  ---
  
  