Under "Local Changes"(I am using git), I have a file that causes a conflict, IntelliJ warns me that "Git Pull Failed Your local changes would be overwritten by merge. Commit, stash or revert them to proceed. View them." Clicking conflicting files, I am presented with Diff/Merge tool, only lets me accept changes from the repository, on top of that, windows has no way to close it.
I am doing something wrong ? Thank you.