#13872: Non-exceptional rigged configuration bijections
-------------------------------------+-------------------------------------
Reporter: tscrim | Owner: tscrim
Type: enhancement | Status: needs_review
Priority: major | Milestone: sage-6.0
Component: combinatorics | Resolution:
Keywords: rigged | Merged in:
configurations bijection | Reviewers: Anne Schilling
crystals, days54 | Work issues:
Authors: Travis Scrimshaw | Commit:
Report Upstream: N/A | 85b64461d4e1c62433615fbd7a76c8c8962e7e19
Branch: | Stopgaps:
public/combinat/rigged_configurations/bijections-13872|
Dependencies: #13838 #14519 |
#14402 #14157 #13605 |
-------------------------------------+-------------------------------------
Comment (by aschilling):
Replying to [comment:53 tscrim]:
> Okay, everything should be fixed now.
I am not sure. When I did git pull I got
{{{
d144:rigged_configurations anne$ git pull
Auto-merging
src/sage/combinat/rigged_configurations/tensor_product_kr_tableaux.py
CONFLICT (content): Merge conflict in
src/sage/combinat/rigged_configurations/tensor_product_kr_tableaux.py
Auto-merging
src/sage/combinat/rigged_configurations/rigged_configurations.py
CONFLICT (content): Merge conflict in
src/sage/combinat/rigged_configurations/rigged_configurations.py
Auto-merging src/sage/combinat/crystals/letters.pyx
CONFLICT (content): Merge conflict in
src/sage/combinat/crystals/letters.pyx
Removing build/pkgs/r/patches/cygwin-logl.patch
Automatic merge failed; fix conflicts and then commit the result.
}}}
I did not have any local changes, so I am not sure why there is a
conflict.
--
Ticket URL: <http://trac.sagemath.org/ticket/13872#comment:54>
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.
