Another option is to use git worktree to create a second copy of the source tree in the repository.
$ git worktree add my_worktree $ cd my_worktree/ $ ln -s ../upstream/ . This creates a subdirectory with a copy of all source files, where one can merge the branches without touching the main tree. The last command is useful in case one decides to build a second copy of sage in the subdirectory. -- 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 view this discussion on the web visit https://groups.google.com/d/msgid/sage-devel/8c587d38-4651-49d8-a5ea-ba4eda7bbcabn%40googlegroups.com.
