Re: Help merging a branch

From: J.M. Maurer <uwog_at_uwog.net>
Date: Thu Nov 13 2008 - 17:40:16 CET

On Thu, 2008-11-13 at 11:38 -0500, Hubert Figuiere wrote:
>
> On Thu, 2008-11-13 at 17:31 +0100, J.M. Maurer wrote:
> > SVN doesn't handle 2-way merges really, which is why I never do
> it...
> >
>
> I think the latest svn (needs to have a new server too) handle merging
> much better. I haven't any experience with it though.

Yep, I read that... Maybe I should look into updating the server. Not
sure how many dependencies that drags in, but I'm hopeful for now ;)

  Marc
Received on Thu Nov 13 17:40:35 2008

This archive was generated by hypermail 2.1.8 : Thu Nov 13 2008 - 17:40:35 CET