#17873: Segfault in iFUB
-------------------------+-------------------------------------------------
Reporter: | Owner:
dcoudert | Status: needs_review
Type: | Milestone: sage-6.6
defect | Resolution:
Priority: major | Merged in:
Component: graph | Reviewers:
theory | Work issues:
Keywords: | Commit:
Authors: David | fa969aa33c8aeb6889f207e2fad6671b1b0436b5
Coudert | Stopgaps:
Report Upstream: N/A |
Branch: |
public/17873 |
Dependencies: |
-------------------------+-------------------------------------------------
Comment (by ncohen):
Hello !
> Any idea on how to resolve this?
Well, I do not understand hwo you got there either. Your branch seems
based on the latest develop indeed, but your must have had some changes in
`generic_graph` when you ran this 'pull'. Either way none of that is
really a problem. Here is what you should do:
1) "Break" your last commit. Its content will become unstaged changes
{{{sage reset HEAD~1}}}
2) At this moment you can do a `git checkout generic_graph.py`. This will
discard any change in `generic_graph.py`. In particular there are
`<<<<<<<` and `>>>>>>>` in there that probably come from a failed merge.
3) When you are satisfied with the result, create the commit again in the
usual way
4) As you modified a commit, technically you rewrote history. When you
push your commit again you will have to use a `-f` flag.
In general, if you call 'tig' more frequently to look at your commits and
diff you should have less troubles with git.
I am in the train right now, a bit after Avignon. God, it feels good to
see this warm sunlight everywhere. It feels more like home than any other
place.
Nathann
--
Ticket URL: <http://trac.sagemath.org/ticket/17873#comment:4>
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.
