On 2017-07-11 14:39, Simon King wrote: > Being on a different git branch, I tried > git cherry-pick xyz
Why cherry-pick and not simply git merge xyz ? This could git help finding a proper merge base. -- 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.
