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

Re: Getting merge conflicts during branch merge

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2007-08-01 15:35:51 CEST

Venkatesh Babu wrote:
> Hi All,
>
> I have done some code changes in a branch and committed the changes.
> When merging the branch into trunk, I'm getting merge conflicts for a
> subset of files that are getting merged.
>
> Given below is the process I adopted for merging the branch:
>
>
>
> 1. Commit all changes in the branch
>
> 2. Switch to trunk
>
> 3. Select the Merge option from the tortoise context menu
>
> 4. In the merge dialog box, selected following values:
>
> FROM - I selected the branch URL and "Head" revision
>
> TO - I selected the trunk URL and "Head" revision
>
> Where to store merged results - Selected to store in local copy

I think this should be reversed:
FROM: trunk@HEAD
TO: branch@HEAD

because you want the changes that happened between the time you created
the branch from trunk until the end of the branch.

But the better solution would be to use
FROM: branch@revision-where-branch-was-created
TO: branch@HEAD

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 Wed Aug 1 15:34:21 2007

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