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
I feel your pain. The only thing I can think of would be to demonstrate
a merge with no conflicts. Then show them what you have to do with the
90% conflicts. You can then explain how much development work can get
done if you do not have to resolve the conflicts.
How often do you merge? One mist
