On 23/05/2014 9:53 PM, Simon IJskes - QCG wrote:
Yes, if possible we could sync up the trunk, by visual diffing trunk
and qa_refactor, merging patches into trunk, commiting to trunk and
release in small controlled steps. Netbeans is capable of doing that.
Gr. Simon
The original concern raised, was significant changes between the 2.2
branch and trunk. Qa_refactor is branched off trunk although trunk has
a couple of commits after the branch point, so it'd probably be easier
to apply those changes to qa_refactor, rather than the other way around.
However I suspect what you meant was to apply the changes in qa_refactor
to the 2.2 branch?
Peter.
