On Wed, 2008-11-12 at 17:00 +1100, Martin Sevior wrote:
> Hi Folks,
> I'm getting ready to merge Frem's multi-page view code into TRUNK.
>
> What is the preferred set of svn commands to do this?
Hmm, i had a mail written with the standard procedure, but it seems like you merged trunk in that branch a while back, which breaks the whole procedure. SVN doesn't handle 2-way merges really, which is why I never do it...
Lemme think about a solution for this.
Marc
Received on Thu Nov 13 17:31:50 2008
This archive was generated by hypermail 2.1.8 : Thu Nov 13 2008 - 17:31:50 CET