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

branch merge and edit conflict

From: Edwin <edwintai_at_gmail.com>
Date: Mon, 8 Mar 2010 02:46:59 -0800 (PST)

Today I found a strange resolve conflict problem using TortoiseSVN
when I merge branch changes back to Trunk.
the file show no different between this revision and last revision.I
merge serval times and try.
I found what different I did.

1.if I use TortoiseSVN pop window to resolve conflict "use local".the
file show no modiflication.

2.if I use resovle conflict window and edit original local line to
third window "use this text block"(the file content was the same with
original file),saved and close it.It shows modification but if use
diff.it shows content is the same.

is there a bug or wrong method I use?

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2456436

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-03-08 11:47:12 CET

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