Merge external conflicts?

Hi!

I sometimes run "svn up" outside IDEA and now and then I get conflicts which I normally just postpone. I get file.java.mine, file.java.r1 and file.java.r2 and ofcourse the original file.java.

Up until now I've manually resolved all conflicts by searching for <<< and fix them where they are. Now I realized, there might be a way to handle this conflict from within IDEA. Is there?

I would imagine something like right click the file and do "handle conflicts" or perhaps on a entire directory.

Thanks.

Please sign in to leave a comment.