On 2015-03-12 10:51, Nathann Cohen wrote:
I was thinking of some entry like "Merging with the latest release (i.e. what should you do when the branch appears in red)".
Note that the Trac algorithm to merge branches has flaws. In several cases, the Trac link was red, but manually doing "git merge" worked without conflicts. Also, Trac doesn't use dependencies, so a branch can be red just because of a conflict in the dependency (in this case, the link will automatically become green as the dependency is merged).
-- 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 http://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/d/optout.
