Martin, I see that you are a noivce user of git :) Here are some advice: 1. I use emacs plugin magit as git GUI, it's very powerful, you'll never need to remeber git commands and its arguments again.
2. I recommand you add your files into your local fricas git repo, break them into independent feature sets, each feature set has its own git branch. (Each of my patches has its own branch, as you can see.) If your branch A depends on my branch B, checkout your branch A from branch B instead of master: 'git checkout -b feature-A oldk1331/feature-B' 3. 'git rebase' is the right tool to solve your problems. Since new patches are commited into master branch, your local feature branch needs updating. Use 'git rebase' to include fixes from master branch and get ready to be merged into master branch. By using magit, rebase is a very easy task to do. You can see that https://github.com/oldk1332/fricas/commits/fix-bags , my 20 days old patches sit on 9 days old master branch HEAD. (You might need 'git stash' before 'git rebase', and 'git push -f' after rebase.) 4. Start from small, easy things. You can prepare a patch that contains cleanups and bug fixes (of graph.spad), by creating a feature branch from fricas/master, develop, rebase if needed. You can work on multiple branches at once. (Again, with the help of magit, it's really easy to develop multiple branches without mess up). Hope that's helpful to you. Ask me whatever you are unclear about. -- 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.
