Re: Merging change sets for a production release,

Guten Tag Gavin Baumanis,
am Montag, 3. Juni 2013 um 20:26 schrieben Sie:

> As for the other ideas, we do already only merge changes from trunk
> that are complete and have been given the appropriate release milestone.
> Our release process is already issue-based.

This alone won't help you. How many merge conflicts you get depends on
the differences between your release branch which you merge the issues
from trunk to and how it differs from trunk. If you have something
like a rolling trunk where development for all next milestones is
done, not necessarily only those for the changes between release 1.0
and 1.1, the chance for merge conflicts rises of course. That's what,
from my understanding, features branches based on release 1.0 or trunk
about that point addresses or why projects with a rolling trunk branch
the whole trunk and not only apply some changes to a release and
stabilize it for some time.

Mit freundlichen Grüßen,

Thorsten Schöning

-- 
Thorsten Schöning       E-Mail:Thorsten.Schoening_at_AM-SoFT.de
AM-SoFT IT-Systeme      http://www.AM-SoFT.de/
Telefon...........05151-  9468- 55
Fax...............05151-  9468- 88
Mobil..............0178-8 9468- 04
AM-SoFT GmbH IT-Systeme, Brandenburger Str. 7c, 31789 Hameln
AG Hannover HRB 207 694 - Geschäftsführer: Andreas Muchow