On 02/02/2017 10:11 AM, oldk1331 wrote:
Hi Martin, because you don't commit to fricas directly,
you have to merge the changes back to your master
branch, that causes problem when Waldek commits
a slightly different version of your patch. And your
master branch history will be messy.
The solution is to use feature branch and rebase
(and then push --force). When you successfully
carry out a rebase, you'll know how it works and
can't live without it. And you will no longer need
a separate repo fricasAlgTop.
Hi Qian and Ralf,
Thanks I'll look into this.
When I'm working on a given subject area, say AlgTop, I like to have a
small flat directory with all the working files in one place so I can
just type things like:
)co gpresent
)r gpresent
)r someLocalTest
)co gpresentOldVersion
That is, files that I find useful but may not be part of FriCAS.
So it just seemed simpler to have repo s that reflect my local structure.
I have thought that I should do this with branches but I do quite like
the idea of having all the directories visible at the same time (so I
can use conventional utilities like Dolphin to copy between them).
I suspect I would find what you suggest better in the long term but when
I have something that works already like live to evolve the changes slowly.
Thanks,
Martin
--
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.
