Thank you guys for your help. It worked :)
What confused me was that there were two merge conflicts. One between the
two branches and one between them and the latest beta version.
--
You received this message because you are subscribed to the Google Groups
"sage-devel" group.
To unsubscribe
It looks like there are commits on the ticket that you don't have (thus the
complaint about a non-fast-forward push). Have you tried using git trac
pull? Or, as Travis suggests, the plain git analogue? I see that you did
git pull, but maybe the tracking isn't set up correctly?
David
On Tue, Oct
