Issue #386 - conflict resolution callback

Hi Stefan,

The comment in the issue states that the implementation is not good
enough yet. I have only seen it once (due to trying to merge out
revisions which had not been merged!) but it looked pretty good. I can
think of only two improvements:

Add the word 'or' between the rows of buttons:

Choose item: [ Use local ] [ Use repository ]
     or
Resolve conflict [ Edit conflict ] [ Resolved ]
     or
Leave conflicted [ Resolve later] [ Resolve all later ]

Also add a help button to take the confused user to the correct page
in our docs. Unless I am missing something obvious, this all seems
pretty straightforward.

One other question - one complaint is that checkouts, updates,
switches, merges, etc can fail if there is a file already there with
the same name. People ask "why can't the checkout continue and let me
fix the problem after". Would the resolution callback help with that
one?

Simon

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org