Re: Feature: Move conflict files to trash after resolving

Lübbe Onken | RA Consulting wrote:
> Hi Folks,
>
> a colleague mananged to shoot himself in the foot today when he tried
> to resolve a conflict. He somehow ended up with a result file that
> did not contain his changes anymore and the .mine and .rnnn files
> were already deleted permanently because he declared the conflict
> "resolved".
>
> would it be possible to move the conflict files into the trashcan
> after resolving instead of deleting them permanently? This way even a
> trigger happy person would get a second chance to resolve the
> conflict again. Now he's trying to restore the files with a disk
> recover program.

Done in revision 11530.

Stefan

-- 
        ___
   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