#10963: Axioms and more functorial constructions
-------------------------------------+-------------------------------------
Reporter: nthiery | Owner: stumpc5
Type: enhancement | Status: needs_review
Priority: major | Milestone: sage-6.2
Component: categories | Resolution:
Keywords: days54 | Merged in:
Authors: Nicolas M. Thiéry | Reviewers: Simon King, Frédéric
Report Upstream: N/A | Chapoton
Branch: | Work issues: To be merged
public/ticket/10963-doc- | simultaneously with #15801
distributive | Commit:
Dependencies: #11224, #8327, | 96fa89eaefdbb020d748e42ab23b9a7545621a14
#10193, #12895, #14516, #14722, | Stopgaps:
#13589, #14471, #15069, #15094, |
#11688, #13394, #15150, #15506, |
#15757, #15759, #16244 |
-------------------------------------+-------------------------------------
Comment (by darij):
Replying to [comment:736 SimonKing]:
> > About git pushing, just to give my 5 cents: I usually don't hesitate
to force-push over a branch in which I made a merging mistake if said
mistake is just a few hours old. The probability of anyone basing on that
branch is rather low. Generally dependent branches seem to be a rarity
around here.
>
> Can you please tell me how to pop the merge commit? What git commands?
What I usually do is:
git checkout [hex of the commit just before the merge, or whatever commit
you want to return to; you can find out the hex using gitk or by looking
at the branch here on trac]
git checkout -b 10963corrected
git push --force 10963corrected:public/ticket/10963-doc-distributive
git branch -D [old local branch containing the useless merge]
This is probably more complicated than necessary...
Anyway, I wouldn't bother with this in this ticket.
--
Ticket URL: <http://trac.sagemath.org/ticket/10963#comment:737>
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/d/optout.
