A) this will change time stamps and hence cause a lengthy compilation anyways
B) there is a very real cost in unnecessary merges, they make the log harder to read. If you want to argue in favor of unnecessary merges then please also provide a reason why other git-using projects are wrong when they discourage unnecessary merges. On Sunday, November 16, 2014 4:40:26 PM UTC, Eric Gourgoulhon wrote: > Hi, > > Maybe the instruction > > git checkout -b my_branch FETCH_HEAD > > > in the developer's guide at > http://sagemath.org/doc/developer/manual_git.html#checking-out-tickets > should be replaced by > > git checkout -b my_branch > git merge FETCH_HEAD > > In this way, the trac branch is merged into the user one. If the trac branch > is based on a version of Sage that is older than that of > the user, this should not trigger a full recompilation, contrary to the > previous instruction. > > > Eric. > -- 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.
