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

RE: Re: Merge/Conflict Misunderstanding

From: Derek Hansen <derek.hansen_at_chiefind.com>
Date: Wed, 28 Nov 2012 06:45:52 -0800 (PST)

Thank you very much. I was able to follow your 7a and 7b and did indeed get the conflict. I'm not sure why I was thinking it would create the conflict.

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-11-28 15:45:59 CET

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