On 02/01/2017 11:17 PM, Kurt Pagani wrote:
Hi Martin
Running the risk to give false alarm again, I can't compile
gpresent.spad after your merge with trunk.
Neither after removing the surplus paren on
line 1467 : + relatorTables(state,rs))
Hi Kurt,
Thank you for letting me know about that, I've corrected it now.
I don't know what happened there, it was driver error on my part in
using git. All I was trying to do was use the latest version from FriCAS.
I successfully downloaded it like this:
cd fricas
git checkout trunk
git pull
git push origin
but it went wrong when I tried to merge it like this:
git checkout master
git merge trunk
If it reports a problem then I run git mergetool but, if I remember
correctly, this time I don't think it did (There were no files inserted
which happens when mergetool is needed). Anyway somehow it inserted 3
lines from an old version.
The reason I have gone into this long explanation is just in case a git
expert might see what I'm doing wrong.
Note: this all happens in:
https://github.com/martinbaker/fricas
I then copy the file to:
https://github.com/martinbaker/fricasAlgTop
to work on code etc.
Martin B
--
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 fricas-devel+unsubscr...@googlegroups.com.
To post to this group, send email to fricas-devel@googlegroups.com.
Visit this group at https://groups.google.com/group/fricas-devel.
For more options, visit https://groups.google.com/d/optout.
