Awesome!
Mark Phippard wrote:
> On Thu, Feb 14, 2008 at 9:08 PM, Tom Walter <walter.tom_at_gmail.com> wrote:
>
>> > Most of these operations will break your working copy if we do not
>> > catch them.
>> Fair enough. I have a pretty good understanding of SVN, so I know what
>> the implications are, but I can see how it could get messy for those who
>> don't. I'm happy to drop back to the command line when I need to do this
>> stuff, but thought I'd check if it was possible.
>>
>> My most frequent use case is when a merge has resulted in conflicts and
>> put those merge-right/left files in a directory. Often I don't want to
>> resolve each conflict but just say in effect 'use right' or 'use left',
>> without having to open the file, copy the contents, paste into the main
>> one, save, delete the others and re-commit. Maybe a more reasonable
>> feature request would be a shortcut for that situation? Below Edit
>> conflicts in the team menu perhaps? Use Right, Use Left?
>>
>
> The next release has this feature.
>
>
Received on 2008-02-15 06:06:33 CET