Getting merge conflicts during branch merge

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 ...

Thank you,
Venkatesh

       
____________________________________________________________________________________
Moody friends. Drama queens. Your life? Nope! - their life, your story. Play Sims Stories at Yahoo! Games.
http://sims.yahoo.com/

---------------------------------------------------------------------
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:30:19 2007