#15367: Empty lists while creating parents
-------------------------------------+-------------------------------------
Reporter: roed | Owner:
Type: enhancement | Status: needs_review
Priority: major | Milestone: sage-5.13
Component: coercion | Resolution:
Keywords: | Merged in:
Authors: Nils Bruin | Reviewers: Simon King
Report Upstream: N/A | Work issues:
Branch: | Commit:
u/nbruin/ticket/15367 | 719cdec176875685142039dce297a7fd8ae4143b
Dependencies: | Stopgaps:
-------------------------------------+-------------------------------------
Comment (by vbraun):
Replying to [comment:47 SimonKing]:
> If I have a local branch associated with this ticket, and if I pull from
this ticket and there are merge conflicts with my local branch, I'd expect
that my old local branch (ticket/15367) be preserved and a new local
branch (say, ticket/15367-1) be created that is equal to the branch
forced-pushed by Nils.
The commits from all of those branches are of course preserved in git. If
**you** like another local branch to give a name to the different
histories then that is fine, but don't force your naming convention on
others. To uniquely reference any of the past branch heads you only need
the commit SHA1, whose historical values is conveniently listed in the
ticket comments.
--
Ticket URL: <http://trac.sagemath.org/ticket/15367#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 http://groups.google.com/group/sage-trac.
For more options, visit https://groups.google.com/groups/opt_out.
