[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: Andy Levy <andy.levy_at_gmail.com>
Date: 2007-08-01 15:35:00 CEST

On 8/1/07, Venkatesh Babu <venkatbabukr@yahoo.com> 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
>
> 5. Click on Merge button
>
>
> I'm not really sure why a merge conflict is happening because I'm the only person working on the project, and after branching from trunk there was no more changes done to the main trunk. I searched for some literature around this on the Internet, but not able to get a clear picture of how to do a merge ....
>
> Request some knowledgeable person to throw light on why I'm getting merge conflict? also, in general, what is the best practice adopted for merging a branch into trunk using Tortoise SVN ...

In most cases, your To and From URLs are the same - what a Merge does
is calculate the difference between 2 "things" (typically it's a
revision range on one URL), then applies that difference to the
"destination" (typically the directory where you issued the Merge
command).

So, I think you wanted your From to be the first revision where
changes were made in the Branch, and your To to be the last revision
in the Branch (or HEAD on the Branch). Then apply that to the Trunk.

---------------------------------------------------------------------
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:33:27 2007

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