On Tue, Sep 25, 2012 at 6:39 AM, Phil Pinkerton wrote:
> Looking for convincing guidelines to change some rather poor practices
>
> Scenario : Project has multiple branches with frequent changes by several
> different developers, merging back to trunk is infrequent and when done merge
> results
Am 25.09.2012 13:39, schrieb Phil Pinkerton:
Looking for convincing guidelines to change some rather poor
practices
Scenario : Project has multiple branches with frequent changes by
several different developers, merging back to trunk is infrequent and
when done merge results in 90% conflicts.
s
mistake I made was not merging often
enough. A daily merge would not be a bad idea.
John
-Original Message-
From: Phil Pinkerton [mailto:pcpinker...@gmail.com]
Sent: Tuesday, September 25, 2012 7:40 AM
To: users@subversion.apache.org
Subject: Branching best practice advice for an inherently
Looking for convincing guidelines to change some rather poor practices
Scenario : Project has multiple branches with frequent changes by several
different developers, merging back to trunk is infrequent and when done merge
results in 90% conflicts.
simple example: Project A1 (trunk) copied to