#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 nbruin):
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.
I think you can "unlink" by doing something along the lines of `./sage
--dev set-remote None no/remote/branch`. Because your local branch is now
associated with a different remote branch (is this a git feature or is
"associated remote branch" something that `sage-dev` invents?) I would
expect that checking out the ticket would now cause a new, fresh branch to
be created.
--
Ticket URL: <http://trac.sagemath.org/ticket/15367#comment:50>
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.
