Cant get merge conflict to appear locally but Azure devops says I have a conflict?

Question

Normally when I have a merge conflict my visual studio code editor will let me know of the incoming changes, but in this case when I pushed up some code Azure devops said I had a conflict but I cant see where locally.

My local branch wont mention any merge conflicts so Im not really sure how to solve.

Any help would be great, unfortunately I cannot add the conflicts tab as some of the other commenters on other posts have suggested so it will have to be done another way.

Answer 1

Do the following locally on your machine:

• check out your main brach (the branch you want to merge into)
• execute git pull
• merge your main branch into your maintenance branch

Now you should see your merge conflict. Resolve the conflict on your maintenance branch and push.