On 12 March 2015 at 09:51, Nathann Cohen <nathann.co...@gmail.com> wrote: > Helloooooooo ! > >> There is nothing specific to our git setup as far as merging and rebasing is >> concerned. So there is no need to reinvent a git-trac wheel here, its just >> about making communicating with trac easier. > > I was thinking of some entry like "Merging with the latest release > (i.e. what should you do when the branch appears in red)".
Where & when do you see something in red? > > A sequence of 3/4 commands with comments would probably be sufficient. > With a link toward "how to upgrade your version of sage" or something. I agree that having this in the dev. man. would be helpful even if it is generic gittery. John > > Nathann > > -- > 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. -- 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.