Does anybody know of a way to force a prompt before SVN automatically merges files when updating a project? You know, like the screen that shows up when conflicts were detected? I find the merge feature does a REALLY bad job sometimes and I would prefer always double checking before it merges. I know I can always use the Local History to go back if I'm not satisfied with the results but I'd rather be prompted in the first place. Does it have to do with Intellij or is it something that I could configure in my SVN installation?