Cant get merge conflict to appear locally but Azure devops says I have a conflict?
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.
Solution
Do the following locally on your machine:
- check out your
mainbrach (the branch you want to merge into) - execute
git pull - merge your
mainbranch into yourmaintenancebranch
Now you should see your merge conflict. Resolve the conflict on your maintenance branch and push.
- Jump to next error / code highlighted in red
- Difference between "Accept Current Change" and "Accept Incoming Change"
- Why is my merge request showing "additions" that are already in my destination branch in GitLab?
- How can I force IntelliJ to resolve conflicts, which are already committed in a file by another person
- git rebase, keeping track of 'local' and 'remote'
- Cannot checkout, file is unmerged
- How to ignore merge conflict?
- During a Git merge conflict resolution, can I check out the conflicting state of a file?
- How do I resolve merge conflicts in a Git repository?
- How can I undo someone removing git history on master branch?
- Why is a 3-way merge advantageous over a 2-way merge?
- Cant get merge conflict to appear locally but Azure devops says I have a conflict?
- Why does git say "Pull is not possible because you have unmerged files"?
- Why does git checkout --ours/theirs not work?
- Forcefully set files status as "unmerged" in a Git repository
- Git - how git merge works
- How to disable `npm-merge-drive` in git merge
- Big git merge - split resolution across commits
- git: How to get "ours, theirs, original" for merge conflicts?
- How do I use Git's `difftool` to merge conflicts?
- How to use Git's default commit message when resolving merge conflicts?
- What is `git merge` doing?
- Git compare "base" version with "theirs" version of a conflicted file?
- How do I view code while resolving merge conflicts in PyCharm
- Git merge: accept theirs for multiple conflicts
- INSERT IF NOT EXISTS ELSE UPDATE?
- How to find out parent revisions of an in-progress merge?
- Fixing a committed unresolved merge conflict
- How to completely replace dev branch into master? (Without having to resolve conflicts)
- Using Source Tree, rebase with conflict, rebase doesn't work after conflict resovled