RE: Merging Branch back to Trunk

For those seeking an answer — I have the solution.

1. Change to your branch
2. merge the trunk into your branch to reflect most recent trunk changes, eventually commit your branch (this is easily done either through merge tracking in SVN 1.5 or via svnmerge.py)
3. Change to trunk
4. Here is the magic command

--- svn merge ._at_HEAD branch_url_at_HEAD

:) this will compare the two final source trees and just move the neccessary changes from the branch to the trunk — __WITH NO CONFLICTS AT ALL__

Commit and enjoy ;)

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1119895

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-02-07 17:18:39 CET