Merge conflict overview dialog, yours/theirs context confusing
Answered
In some cases, the "Yours/Theirs" context is clear, like if I'm merging changes from the remote git server, but in other contexts, such as applying a stash, patch or merging two of my branches together, it's easy to get confused. "Yours "is always the version you have checked out in your repo, but my stash/patch/other branch is mine, not "Theirs".
Please sign in to leave a comment.
Local changes are also yours. Theirs always stand for incoming changes, whatever they are (from a remote server, from a patch, from stash, from another local branch, etc).
There are requests to show more details about commits in the Merge dialog, probably that could help. https://youtrack.jetbrains.com/v2/issue/IDEA-102522