On Fri, May 11, 2012 at 1:19 PM, Drew Smathers
<email address hidden> wrote:
>> Merge away!
>
> Hi Duncan, am I the one who is supposed to do the merge, or does this need to be done by another developer?
Yes! I've just added you to the team -- given your contributions (and
god-like patience!), I think that's more than reasonable :-)
You'll want to do the obvious (merge trunk into your branches, check
for conflicts, push, etc.), but you should be all set!
On Fri, May 11, 2012 at 1:19 PM, Drew Smathers
<email address hidden> wrote:
>> Merge away!
>
> Hi Duncan, am I the one who is supposed to do the merge, or does this need to be done by another developer?
Yes! I've just added you to the team -- given your contributions (and
god-like patience!), I think that's more than reasonable :-)
You'll want to do the obvious (merge trunk into your branches, check
for conflicts, push, etc.), but you should be all set!
Let us know if you run into any problems.
d