[SVN] How do you Resolve and edit Conflicts?

Hi,

In general I always use the TurtoiseSVN windows desktop client for SVN Updates and Commits but today I've got some Conflicts to resolve in 5 files and I don't like the TurtoiseSVN 'edit conflicts' User Interface. When previously developing with Eclipse/ Flex Builder I would always use the built in compare/ resolve conflict tool as it makes much more sense to me.


So, I've just used TurtoiseSVN to do an SVN Update...

1). In IDEA, my conflict files are coming up in red. I right-click a file in conflict, select the "Subversion >" menu but what do I choose now? There is nothing to indicate editing the conflicts?

So I do a search in the docs: "edit svn conflicts" which leads me to this page: http://www.jetbrains.com/idea/webhelp/resolving-conflicts.html

The first part doesn't apply to me because I'm not commiting any files from within IDEA, I did an SVN update using Turtoise which lead me to have conflicts, therefore nothing is appearing in the Failed Commit node. The paragraph that starts "If you synchronise a file, that..." is the closest to my situation but I don't have a "conflict" node under my Local tab of the Changes tool, I only have a Default node, Unversioned and Ignored nodes. Within the Default node I can expand the tree to locate a conflicted file. I can't see anything about the file status being "merge", as mentioned in the docs.

2). How do I open up the 3-pane resolve conflict tool? All I can achieve is the 2-pane Show Diff tool from a right-click or by double-clicking the file it opens it up normally and shows the actual SVN conflict notation such as "<<<<<<<< .mine".



Thanks,
Nick

4 comments
Comment actions Permalink

Open "Change > Local" tab. On this tab for each conflict several files displayed. Right click one with red file name and search in menu for item with "something like Resolve Conflict" (I don't remember item name exactly).

0
Comment actions Permalink

Here is a path in right-click menu. "Subversion > Resolve Text Conflict...".

0
Comment actions Permalink

Hi,

This option for me only opens the file in the normal code editor... I'm not getting the 3-pane compare edit tool.


Nick

0
Comment actions Permalink

I had similar problem with wrong editor month ago (but in different place - in "Changes > Repository > Revision changes list"). Instead of "two-way-dif" normal editor was opening.

Back to your problem. It looks like a bug, so try to reproduce problem for another file. Try same thing on another computer. Post issue to JetBrains Issue Tracker.

0

Please sign in to leave a comment.