Thanks Nathann and Volker. I wrote the comments below before seeing Volker's reply, which explains everything I wanted to know.
On 28 December 2015 at 12:28, Nathann Cohen <[email protected]> wrote: > Though Volker actually said "rebased", I expect that you shouldn't > have any problem if you just merge them with the latest beta. You > don't even have to checkout the old branch once you are on 7.0+, just > do: > > git checkout -b new_branch origin/develop > git merge your_old_branch -m "Merged with 7.0"+ > > And you are done, without having to recompile anything. OK, so for that to work you definitely do not want a separate repository for 7.0 since the your_old_branch would be unknown. Maybe Volker meant that we could continue to work on these old branches with 6,10 until they are ready for submission and only then rebase them. Some of the branches I have are out for review (in some cases have been so for a long time) in which case rebasing on 7.0 as soon as possible would seem to be necessary to do right now to have any hope of anyone ever reviewing them. Anyway, I am building a separate 7.0 as well. > > 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 [email protected]. > To post to this group, send email to [email protected]. > Visit this group at https://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 [email protected]. To post to this group, send email to [email protected]. Visit this group at https://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/d/optout.
