On 2014-09-03 15:19, kcrisman wrote:
Not sure whether this or sage-support is more appropriate...
On e.g. http://trac.sagemath.org/ticket/16331 (well, and elsewhere)
there is a branch listed that for some reason doesn't merge cleanly.
Unfortunately, that means I can find no way to look at the diff visually
all at once for this branch - I can do it commit by commit, but there
are MANY commits and that would be very tedious and possibly misleading.
I think the best solution is to actually fix the conflict. Checkout the
ticket in your local Sage installation and then do:
jdemeyer@tamiyo:/usr/local/src/sage-config$ git merge origin/develop
Removing src/sage/numerical/test.py
Auto-merging src/sage/numerical/mip.pyx
Removing src/sage/graphs/hypergraph.py
CONFLICT (modify/delete): src/sage/game_theory/cooperative_game.py
deleted in HEAD and modified in origin/develop. Version origin/develop
of src/sage/game_theory/cooperative_game.py left in tree.
[...]
Automatic merge failed; fix conflicts and then commit the result.
Fix this conflict and then commit and push to trac.
--
You received this message because you are subscribed to the Google Groups
"sage-devel" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to sage-devel+unsubscr...@googlegroups.com.
To post to this group, send email to sage-devel@googlegroups.com.
Visit this group at http://groups.google.com/group/sage-devel.
For more options, visit https://groups.google.com/d/optout.
