[Gimp-web] SVN branches: v2.4/trunk or trunk/v2.2?

[Sven Neumann]

Hi,

On Thu, 2007-03-22 at 10:16 +0100, Raphaël Quinet wrote:

> I am a bit concerned about what will happen when we merge the v2.4
> branch into the trunk.  I only have a limited experience with merges
> in SVN and so far I only tried to merge two branches instead of
> merging a branch back into the trunk.

At work we are always merging from branch to trunk, almost never are
changes merged in the other direction. This hasn't caused any problems
so far. I don't see why it should cause problems here.

The merge should be pretty much painless since there are basically no
changes on the trunk. Perhaps the only thing that will change there is
the version number of the stable release when 2.2.14 is rolled out.


Sven