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

Merge branch into trunk

From: Grace Go <grace.go_at_syncvoice.com>
Date: 2007-01-03 19:09:53 CET

Hello All,

I am new to this and need help in using TortoiseSVN for merging branch
(head) and trunk (head) with the same file being modified. For some reason I
tried but it did not say anything that theres a conflict. Can anyone help in
providing the steps?

Thank you,
Grace

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Wed Jan 3 19:10:10 2007

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.