Well, there should be no problem with my patch, as it does just create a new file and does not touch anything else. The need for a merge was triggered because you did not update sage-combinat before commiting. This is normal and rather harmless, unless two persons work on the same files at the same time.
-- You received this message because you are subscribed to the Google Groups "sage-combinat-devel" group. To view this discussion on the web visit https://groups.google.com/d/msg/sage-combinat-devel/-/9L5XfjEqNRsJ. To post to this group, send email to sage-combinat-devel@googlegroups.com. To unsubscribe from this group, send email to sage-combinat-devel+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/sage-combinat-devel?hl=en.
