[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: Venkatesh Babu <venkatbabukr_at_yahoo.com>
Date: 2007-08-01 16:33:58 CEST

Hi Stefan,

I have one small question on this comment. Request your answer ...

Quote -
"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"
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

From the comments, it is clear that the merge results will be present in local machine ... In fact, I tried your approach of Merge from HEAD to branch HEAD and store the results in local file system. This merge succeeded without any conflicts ... I'm not clear on how to proceed from this point ... If I commit the changes, the commit is happening in branch whereas I want the changes to appear in the trunk ... So, my question is how can I update the trunk to contain my merged results? because we want to percolate all our code changes to the trunk.

Thank you,
Venkatesh

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
       
____________________________________________________________________________________
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 16:32:23 2007

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