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

Re: Merge branch into trunk

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2007-01-04 20:49:40 CET

Grace Go wrote:
> 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?

The detailed steps are fully described in our docs (press F1 in any TSVN
dialog, or use the ones on our homepage http://tortoisesvn.net).

You won't get a conflict if Subversion is able to merge the changes even
if both files are modified. You will only get a conflict if _the same
lines_ in both files are modified _differently_.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Thu Jan 4 20:49:53 2007

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