#17647: Branch and Bound for vertex separation
-------------------------+-------------------------------------------------
Reporter: | Owner:
dcoudert | Status: needs_review
Type: | Milestone: sage-6.5
enhancement | Resolution:
Priority: major | Merged in:
Component: graph | Reviewers:
theory | Work issues:
Keywords: | Commit:
Authors: David | 2ad04bc49191f533041f095284a8a6ae29ab8f69
Coudert | Stopgaps:
Report Upstream: N/A |
Branch: |
public/17647 |
Dependencies: |
-------------------------+-------------------------------------------------
Comment (by ncohen):
Hello,
> I tried to do what you proposed. I don't know if the result is correct
or not with regards git.
It is not. If you click on 'commits' right next to the branch, you will
see that some commits appear twice (like 'trac #17647: small typo')
> If it is not the case, please help me going back to the state before the
rebase.
It is very difficult for me to tell you what to do now, considering that I
have no idea how you ended up with this branch in the first place. It
seems that all you did wrong was to merge two branches together in the end
(you merged a branch with a copy of that branch, apparently). So I would
say that all you need to do is to go back before that happened, i.e.:
{{{
git checkout 30f80f1c4158b512310cde25b32d311a92220e2e # go back to 'trac
#17647: rebase on 17665 to use binary_matrix'
git push trac HEAD:public/17647 -f # update the distant branch
}}}
Please double-check that, for it will erase commits from the trac server.
> I should certainly add a dependency with ticket #17665, right?
Yes.
Nathann
--
Ticket URL: <http://trac.sagemath.org/ticket/17647#comment:23>
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.
