Re: [sage-devel] incomprehensible merge failure on trac

2021-09-27 Thread Dima Pasechnik
for the record: to get your branch on: (you probably don't need these 2 lines) git fetch trac public/rings/lazy_dirichlet_series-32309 git checkout -b public/rings/lazy_dirichlet_series-32309 trac/public/rings/lazy_dirichlet_series-32309 merge the upstream devel branch (i.e. 9.5.beta2): git

Re: [sage-devel] incomprehensible merge failure on trac

2021-09-27 Thread Dima Pasechnik
I just merged the latest devel branch into your ticket branch On Mon, Sep 27, 2021 at 12:34 PM 'Martin R' via sage-devel < sage-devel@googlegroups.com> wrote: > > The branch field on https://trac.sagemath.org/ticket/32309 is currently > red, but "git trac try 32309" does not report a merge

[sage-devel] incomprehensible merge failure on trac

2021-09-27 Thread 'Martin R' via sage-devel
The branch field on https://trac.sagemath.org/ticket/32309 is currently red, but "git trac try 32309" does not report a merge failure. What can I do? Martin -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To unsubscribe from this group and