On 07/16/2016 04:44 PM, Martin Baker wrote: > Its like I have a fork of FriCAS just for my own private use (with > all the overheads of tracking and merging changes).
Well, using git means that you locally always have a fork. But it's not a fork in the sense of you do your own distribution. It's just local. Anyway, I also have some branches on top of master and I have locally my own version of FriCAS. I usually do a "git rebase upstream/master" (instead of "git merge upstrea/master"), i.e. I keep my changes linear on top or master. For that you must have setup your git repository via $ git remote add upstream https://github.com/fricas/fricas.git so that it shows via $ git remove -r a line like upstream https://github.com/fricas/fricas.git You can then say $ git fetch upstream in order to update your "upstream/master" branch. Anyway, you have to learn how "git rebase" really works if you want to do this. In particular you may sometimes run into troubles if an upstream change conflicts with your own code, then "git rebase" stops in the middle and you have to resolve conflicts. But don't worry, contact me if you run into a problem. Git usually doesn't loose any changes. It's a safety net. (Anyway, for new code, there cannot be any 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 post to this group, send email to [email protected]. Visit this group at https://groups.google.com/group/fricas-devel. For more options, visit https://groups.google.com/d/optout.
