Changes to scene.spad.pamphlet contain a lot of whitespace change,
do you really mean it? Also, did you compare with version that
I commited? Apparently your new version is wiping out a few
spelling corrections that I made (construct vs constuct).
Martin, I guess, you should learn how to rebase your changes on top of
master before you work on new improvements and before you propose a new
version. At least you should merge with trunk.
I don't know how exactly you have set up your local repository if you
have followed
https://sites.google.com/site/hemmecke/fricas-svn#how-to-work-with
you will have a remote called "upstream". Then
git checkout master
git fetch upstream
git rebase upstream/master
should be enough. Well, you might have to resolve conflicts. Contact me
if you run into troubles.
Instead of git rebase you probably can also do
git merge upstream/master
The output is a little different (not linear anymore), but that is
probably still better than not incorporating the latest changes from
trunk at all.
Ralf
--
You received this message because you are subscribed to the Google Groups "FriCAS -
computer algebra system" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/fricas-devel?hl=en.
