It means that our trac plugin had problems mergin in the lastest beta. You should try to merge yourself, and see if there are any conflicts. If there are conflicts: resolve and push. Its possible that manual merge succeeds because the git commandline client is better at merging, in that case you can ignore the error (though you might want to push the merge, too, to enable the online diff viewer)
On Sunday, May 29, 2016 at 2:47:35 PM UTC+2, jhonrubia6 wrote: > > I noticed some typos on #10180 so I prepared a patch and committed, but > now I see the branch in red in trac ticketing system and an error "trac's > auto merging failed" > maybe the ticket was already closed even if the status was needs_review , > I do not understand this error, nor how to solve it. > -- 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.
