Since your repo is too far behind, I suggest you start a new repo and migrate your patches.
In the new repo, do not develop on master branch, develop each feature on its own branch. Before submitting changes, rebase this feature branch to current upstream master branch. I assume you know the difference between merge and rebase? It's a bit hard to describe, but once you do it a few times, you'll know. You may need to resolve conflict sometimes, then "git rebase --continue" or use other GUI. Another thing, you change 1 file, but you want to break into 2 commits, you know how to do this? A bit hard on CLI, strongly suggest use some GUI. -- 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.
