On Wednesday 08 Feb 2012 11:25:58 Ralf Hemmecke wrote: > 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, Usually the situation is that I work on the code (in seperate spad files) and documentation (in pamphlet file). So when I wish to publish I do the following: 1) cut and paste all the seperate .spad files back into pamphlet file. 2) download the master pamphlet file to my local computer. 3) compare my new pamphlet file with master just downloaded by using KDiff3 program and resolve any differences. 4) if there have been any changes by Waldek then untangle (using cut and paste) this back into seperate .spad files. 5) check that they still compile in case there is some interaction between my and Waldeks changes. 6) upload new pamphlet file to github Upto now this has worked although it is very tedious. Recently there was a problem with matrix and scene files and I think this is because I started to use a program called 'Kile' to edit the pamphlet files (as it has some help with LaTeX commands). I guess its always going to be a problem using such a program to edit a file that contains a mixture of Tex and code. Martin -- 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.
