#15567: Fix Alphabet and improvements to Family
-------------------------+-------------------------------------------------
Reporter: | Owner: sage-combinat
tscrim | Status: positive_review
Type: | Milestone: sage-6.1
defect | Resolution:
Priority: major | Merged in:
Component: | Reviewers: Nathann Cohen
combinatorics | Work issues:
Keywords: | Commit:
alphabet | f73d436e2590d5a4134b813460464dd62267c6fe
Authors: | Stopgaps:
Travis Scrimshaw |
Report Upstream: N/A |
Branch: |
public/15567 |
Dependencies: |
-------------------------+-------------------------------------------------
Comment (by ncohen):
> You've called "git merge", which creates a merge commit. Or are you
running a `git rebase` somewhere? My problem comes from branches that I
have before the next beta version comes along, are you suggesting that I
delete these branches, then re-pull all of them using of the above?
Nonono ! But you can merge the branch into develop, instead of merging
develop into your old branch. I create a branch on the latest develop, and
call `git merge the_old_branch`. My new commit is above the latest beta,
and as there was no checkout none of the files changed. You can then do a
`sage -b` and only the files touched by the old branch changed.
> However 9310e04 vs. b39e393 is changing history.
Ahahah. Well. That was my own last commit only (the hash of the other ones
never changed, that part of the history was not rewritten), and that was
only seconds after having pushed it. I think we can tolerate things like
that `:-P`
Nathann
--
Ticket URL: <http://trac.sagemath.org/ticket/15567#comment:32>
Sage <http://www.sagemath.org>
Sage: Creating a Viable Open Source Alternative to Magma, Maple, Mathematica,
and MATLAB
--
You received this message because you are subscribed to the Google Groups
"sage-trac" 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 http://groups.google.com/group/sage-trac.
For more options, visit https://groups.google.com/groups/opt_out.
