Line endings may differ between your branch and master (LF vs CRLF, for example). This can cause hundreds of merge conflicts which Azure DevOps expects you to merge manually, one by one. Instead:
# From the root of your repository remove everything from the index git rm --cached -r . # Change the autocrlf setting of the repository (you may want # to use true on windows): git config core.autocrlf input # Re-add all the deleted files to the index # (You should get lots of messages like: # warning: CRLF will be replaced by LF in <file>.) git diff --cached --name-only -z | xargs -0 git add # Commit git commit -m "Fixed crlf issue"