How can I compare my local file to the latest version in the git remote repository?
Answered
The latest version of a file in the remote repository creates a huge merge conflict. I rolled back my local copy from the command line with git merge --abort.
Does IntelliJ have a way of comparing my local file with the latest version in the remote repository? I can't find anything that will do that.
Thanks.
Please sign in to leave a comment.
What you want to do is actually comparing versions of the file in your working directory and the remote branch - so you could use the Git - Compare with Branch action from the context menu, and select the remote branch you were merging.
That worked. Thanks.