> Yes, merge (at least via Github button) makes mess. I do not > know how well rebase will work, but probably will be better.
I have seen that one now can also choose at Github whether a rebase or merge commit will be done. Actually, for most "rebase"-commits it will end up in a simple linear fast-forward commit. Rebase might actually only have issues if master has advanced since the pull request was started and the master branch has modifications that somehow conflict with the PR. But even that can be handled in a "rebase". I don't however know how github helps to resolve conflicts. Ralf -- You received this message because you are subscribed to the Google Groups "FriCAS - computer algebra system" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/fricas-devel/4c08f984-9517-c0f3-7b4f-0a7b716f7689%40hemmecke.org.
