Guten Tag Kenny Raghunath,
am Dienstag, 25. September 2012 um 22:21 schrieben Sie:
> Anyone have any suggestions on what I can do to fix this?
It's really unlikely Subversion itself is the problem, it surely has
something to do with your deployment, working copies, merge strategies
or something l
Hello,
I'm having these strange issues when moving my code onto my production
environment. I start out by doing my PHP code within the trunk. When I'm
done, I merge my changes into a release branch and then deploy it via
Beanstalkapp to my staging environment. When I'm sure that the code is in
wor
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
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
