[Subclipse-users] Interactive conflict resolution during update

The Subversion command line client (since 1.5 i think) has an interactive conflict resolution feature. It is very practical because in our project, the most conflicts are trivial ones in well known places.

Is there something similar for the subclipse plugin?
This is something, the eclipse cvs integration had as an option - and i really miss that for subclipse.

I have something in mind, like a dialog popping up for every conflicting file, giving me the option to either: take my version, the repo version, leave the file as it is, edit the conflict, put the subversion conflict markers into the file, or cancel the update process.

I know i could use the collabNet merge client, or the team synchronize feature - but both options are to complicated for a simple update.

------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=2622996

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2010-06-17 13:46:43 CEST