How do I resolve merge conflicts when I am not prompted to do so?

Answered

This happens to me often with Rider's git implementation:


I get a warning telling me I have conflicts after an attempted merge, but the blue link/button does nothing, and I am not prompted to resolve these conflicts.

What does the IDE expect me to do in this case?

Your documentation says I will be prompted to resolve any conflicts, what do I do when I am not prompted? It also says these conflicts should be listed in my local changes, which they are not?



1 comment
Comment actions Permalink

Please check your local changes, there should be "Merge Conflict" changelist under your active changelist and button "Resolve" 

0

Please sign in to leave a comment.