On 2016-12-07 10:00, Dima Pasechnik wrote: > I don't see how using git worktree would reduce recompilation, for the > merging workflow you recommend touches a lot of files, potentially.
In your SageMath root, assuming you are at branch develop: git worktree add ../merge cd ../merge git trac checkout 99999 # getting on an old branch t/99999/something git merge develop cd ../sage-develop git checkout t/99999/something No files touched (except the ones changed in the old branch of course) > The workflow I recommend may be paired with git rebase to get rid of extra > commits, leaving a nicer history. rebase is almost always a bad idea. (The history looks nicer, but noone using the old branch can track the changes.) FWIW, http://justinhileman.info/article/git-pretty/git-pretty.png Daniel -- You received this message because you are subscribed to the Google Groups "sage-support" group. To unsubscribe from this group and stop receiving emails from it, send an email to sage-support+unsubscr...@googlegroups.com. To post to this group, send email to sage-support@googlegroups.com. Visit this group at https://groups.google.com/group/sage-support. For more options, visit https://groups.google.com/d/optout.
