How do I edit version conflicts in Studio

[wiil_rourke]

Hi, I've got file that I'm told is in conflict with the repository. If I select 'Edit Conflicts' I get the dual pane view that shows me the differences. In this case, my working copy is the one I want to keep, but I can't see any way to copy (or force) those changes across to the repository copy. I've got an option to copy changes from right to left, but that's not what I want, it leaves me useless code in my working copy that I'm only going to have cut out. Copying changes from left to right is grayed out. I can't commit the file, because it's on conflict, I can't proceed. Any advice?

[totalsupport]

The best way to resolve issues like this, is by using the "Team Synchronizing"-perspective. After the synchronization you can see exactly which files/changes are incomming, which are outgoing and which are conflicting. You can then resolve conflicts by right-clicking on them and selecting on of the appropriate options. In your case "Mark as merged" would do the trick.

[bbrulant]

Editing conflicts doesn't work for me neither. My changes are not saved from the "Edit conflicts" view and the SVN markers remain in the files, whereas it worked great in the 8.x version of Studio. Is there a workaround please? Because I have to edit the files manually to do the merge. Thank a lot for your help.