On Sat, Jul 9, 2016 at 5:48 PM, Travis Scrimshaw <tsc...@ucdavis.edu> wrote: > > > On Friday, July 8, 2016 at 3:39:59 AM UTC-5, Jori Mäntysalo wrote: >> >> What is wrong with https://trac.sagemath.org/ticket/20980 ? >> >> The branch field is red, but I think I did nothing unusual. Also I got an >> error message about mails not sent when setting it to needs_review. >> >> > > Also, the automerging on trac has been known to be less permissive than > local versions of git.
Yep, from what I can tell it doesn't try the same range of merge strategies that are available to git. -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To unsubscribe from this group and stop receiving emails from it, send an email to sage-devel+unsubscr...@googlegroups.com. To post to this group, send email to sage-devel@googlegroups.com. Visit this group at https://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/d/optout.
