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.
Hub
Received on Fri Sep 14 13:52:55 2007
This archive was generated by hypermail 2.1.8 : Fri Sep 14 2007 - 13:52:56 CEST