#14840: SageNB package contains many packages
-------------------------------------+-------------------------------------
Reporter: felixs | Owner: felixs
Type: defect | Status: needs_review
Priority: major | Milestone: sage-7.2
Component: packages: | Resolution:
standard | Merged in:
Keywords: notebook, days77 | Reviewers: Salvatore Stella
Authors: Jeroen Demeyer | Work issues:
Report Upstream: Reported | Commit:
upstream. No feedback yet. | 161ac3ba998689b9a3a3435ed85e4316cd61fb77
Branch: | Stopgaps:
u/jdemeyer/ticket/14840 |
Dependencies: |
-------------------------------------+-------------------------------------
Comment (by dimpase):
Replying to [comment:44 jdemeyer]:
> Replying to [comment:43 kcrisman]:
> > Oh, I don't think I saw that this was 0.12 even in
[https://github.com/sagemath/sagenb/pull/371/commits/1f37bfc8195ebdf481def9e292b6914d06e46ba5
this commit]. How would I (eventually) merge that in the github master
branch without creating the extra merge commit?
turn merge squashing on, then merge as you'd normally merge a PR on
github.
https://help.github.com/articles/about-pull-request-merge-squashing/
>
> I don't have enough experience managing a github project to answer this
''using github''. But it should be possible to do the merge using the
standard `git merge` command line.
With subsequent `git rebase`?
--
Ticket URL: <http://trac.sagemath.org/ticket/14840#comment:49>
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 https://groups.google.com/group/sage-trac.
For more options, visit https://groups.google.com/d/optout.
