If you write a script that automatically figures out where the merge conflict is coming from (ideally as PR to the git trac releasemanagement) then I'll be happy to use it...
On Tuesday, January 1, 2019 at 12:38:00 PM UTC+1, Simon King wrote: > > But the next time, please provide a ticket number, rather than just > commenting "merge conflict". > -- 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.
