Six issues to make the Subversion Merge way much better in IntelliJ IDEA: 1 LOW ) "Subversion" | "Resolve Text Conflict" should be renamed to something like: "Visual Merge of Conflicts", "Visual Merge of Text Conflicts"," Merge of Conflicts", ... (Also see issue http://www.jetbrains.net/jira/browse/IDEA-12036) 2 MEDIUM) The "Visual Merge of Conflicts" should be made available in the "right-click"-menu of the "Merged with Conflicts" list in the window "Version Control" | "Integrate Project Info". This should be available on BOTH a specific file OR on the whole list (i.e. on the folder showing the conflict list). 3 HIGH) If the "Visual Merge"-dialog has been started for a specific file, it should STILL show the "Goto next file" button! I.e. it should be the exact same dialog, the only difference is which file it starts with (a specified one, or if not specified: The first of all the conflicting files). 4 HIGH) The "Subversion" | "Visual Merge of Conflicts" should ALWAYS be available in the menu if there are ANY conflicting files. Today it's inactive until a specific conflicting file has been selected. ((And then it's not possible to go to the next conflicting file, see number 3 above...)) 5 MEDIUM) Please rename the "Integrate Project" to "Merge Project" or at least "Merge/Integrate Project". It's current naming is very confusing. 6 LOW) Please add the menu synonym "Version Control" | "Continue Visual Merge..." for the "Version Control" | "Subversion" | "Visual Merge of Conflicts". None of the other developers at my company find the Subversion Merge helpful without number 3 & 4 above. PS. There's also the "ignore-whitespace-issue", but I saw that someone else had already logged that in http://www.jetbrains.net/jira/browse/IDEABKL-5053. That issue is really "High" priority, maybe even "Extreme". Without it, the Merge is more or less useless. DS. Thank you in advance! Regards, /Jonas