On Fri, 2007-09-14 at 07:52 -0400, Hubert Figuiere wrote:
>
> On Fri, 2007-09-14 at 21:40 +1000, Martin Edmund Sevior wrote:
> > Is there any handy tool in svn for doing this or should I just make
> > diffs from the branches and fix the conflicts?
>
> "svn merge" should help.
But it is best to use a tool like
http://www.orcaware.com/svn/wiki/Svnmerge.py
This allow tracking which revisions have been merged.
Hub
Received on Fri Sep 14 14:26:36 2007
This archive was generated by hypermail 2.1.8 : Fri Sep 14 2007 - 14:26:36 CEST