[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Conflicts

From: Eric Lemes <ericlemes_at_gmail.com>
Date: Fri, 3 Oct 2008 17:16:07 -0200

Hi there,
I have a question about conflict resolution in TortoiseSVN. I'm currently
using TSVN 1.5.3. within a 1.4.2 server.

When I do an update and a conflict files appear, I first edit the conflicts
(with Araxis Merge) and left the ".mine" file in the correct state. Then I
click in "Resolved".

Then the file appears as changed and I can commit it. In this version, the
file appears with the ">>>>>>>>" conflict markers.

Is this behavior correct? I think in older versions (1.4.x), TSVN
automatically removes the conflict markers.

Eric
Received on 2008-10-03 21:16:14 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.