21 Jun
2006
21 Jun
'06
2:35 p.m.
Aaron wrote
Still I don't think you have provided a reason against merging the branch into trunk. A merge will not stop the branch from ending. A merge will just get their code a little much needed testing. Work can continue on the branch if that is desired, right?
Exactly.
I still vote "merge". I think we will have some difficulties to address either way. But I think there is a large benefit to having the code in trunk.
The goal of that rule is met with a text file containing every commit of the SoC student in unified diff form, cat'ted together. It is likely that this mega-patch can be reduced by applying it and diffing it again.
To get this need not be difficult.
Pro merge.
ralf