Kevin: Well, sure. He's proposing this merge into trunk. :) I assume when you test, you always merge into trunk to test it. If you're saying there's conflicts to resolve, then yeah, we'll need to get trunk merged into this and conflicts resolved.
« Back to merge proposal
Kevin: Well, sure. He's proposing this merge into trunk. :) I assume when you test, you always merge into trunk to test it. If you're saying there's conflicts to resolve, then yeah, we'll need to get trunk merged into this and conflicts resolved.