Feature Request: resolve on update

I've just done an SVN Update, and the status window shows that a file
was conflicted.

Cool, I double-click it to edit the conflicts, and sort it out using my
third-party merge tool (not TortoiseMerge). Since it's not SVN-aware
itself, of course, it doesn't have a "Resolved" button.

So back to the status screen, and I right-click on the file expecting it
to let me "Mark as resolved". But no, the only options I get are to
"resolve using theirs" or "resolve using mine", which would throw away
the merging I just did.

Please add the option to just mark it as resolved in that screen. Sure,
you can do it later on (in the commit or check for modifications
screens, or directly to the file), but it's simpler if you can do it at
the time you're doing the merging.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Tue Jul 25 01:27:19 2006