Re: How to manager trunk and branch
From: vajk fekete <halaloszto_at_yahoo.co.uk>
Date: 2007-01-22 10:59:01 CET
hi!
a very simple method:
You do the merge to the local working copy. Then when commiting the results, you uncheck those file you do not want to merge.
hope this helps,
vajk
----- Original Message ----
From: fjin <benpsm_at_gmail.com>
To: dev_at_tortoisesvn.tigris.org
Sent: Monday, 22 January, 2007 6:39:57 AM
Subject: How to manager trunk and branch
/* redirected from dev to users */
dev,
I want to use merge to update my branch code from trunk. But in my
branch code, i want some files can be ignored when merge. But i can't
find how to set in tortoisesvn, can you tell me?
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: dev-help_at_tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
___________________________________________________________
New Yahoo! Mail is the ultimate force in competitive emailing. Find out more at the Yahoo! Mail Championships. Plus: play games and win prizes.
http://uk.rd.yahoo.com/evt=44106/*http://mail.yahoo.net/uk
|
This is an archived mail posted to the TortoiseSVN Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.