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.
On Thursday, March 12, 2015 at 8:28:45 AM UTC+1, Nathann Cohen wrote: > > Hello everybody, > > I just noticed that we do not seem to have in our developer's manual > instructions about how to rebase/merge a branch when it becomes > incompatible with the latest beta. > > I do not use 'git trac' myself, but it would be cool if anybody who > does could add such an entry in the developer's manual: this is > something that we are bound to explain individually many many times > otherwise. > > In the meantime I will try to make the 'git the hard way' version of > it a bit easier to follow. > > 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.