On Tuesday, November 15, 2016 at 1:34:00 AM UTC, Paul Masson wrote: > > > > On Monday, November 14, 2016 at 3:51:49 PM UTC-8, Dima Pasechnik wrote: >> >> Did you have a pressing need to build an old branch? >> I'd normally first rebase over the latest beta, and then build. >> > What do you mean by "rebase" precisely? Just merging the current develop > branch or something else? >
either this, or the other way - i.e. merging the old branch into (a copy of) the current development. One can also use "git rebase" to clean the history up, if needed, by squashing commits. > > I'm under the impression that merging develop, while convenient, is > confusing for the history of a branch, so I've been avoiding that and > running ccache instead to cut down on build time. Or is the current > recommendation to always merge develop after every new beta? > > The branch I've been working on has been under review for some time, so I > don't want to set things back by moving code around unnecessarily. > a reviewer would normally (try to) merge your branch into the current beta, and review the result. > Besides, why shouldn't I always be able to go back and rebuild a previous > branch without wiping everything clean? Trying to understand what goes > wrong in the process. > -- 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 https://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/d/optout.
