[Numpy-discussion] 1.10-devel is open

[Julian Taylor]

On 07.07.2014 10:02, Julian Taylor wrote:
> On 07.07.2014 07:53, Charles R Harris wrote:
>> Just so. The fixes for 1.9.0b1 are now in that branch ready for the next
>> beta.
>>
> 
> how did you do that without a merge commit?
> however you did it you have git has lost ancestry which is not so nice
> for backporting.
> If there are no objections I'd like to rewind the maintenance branch
> back to beta1 and merge master in properly.
> 

I went ahead with the and rewind + merge [0], please reset your branches
to the origin in case you updated the maintenance/1.9.x branch in last
few hours and get merge errors when running git pull.

[0] https://github.com/numpy/numpy/pull/4849

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <http://mail.python.org/pipermail/numpy-discussion/attachments/20140707/203c6840/attachment.sig>