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
Would you please help me with this? There seems to be some conflict but I
am lost.
Git suggest to pull. But that does not change anything. After all that is
what I just did.
[simon@Quadrator sage]$ git pull
Already up-to-date.
[simon@Quadrator sage]$ git status
On branch t/23978/rich_comparison_
On Sat, Oct 7, 2017 at 3:23 PM, 'Martin R' via sage-devel
wrote:
> I was trying to push to #23847, but get an unhelpful error message... please
> help!
>
> martin@Martin-Laptop:~/sage-patchbot$ git trac push
> Pushing to Trac #23847...
> Guessed remote branch:
> u/mantepse/make_the_experimental_fr
I was trying to push to #23847, but get an unhelpful error message...
please help!
martin@Martin-Laptop:~/sage-patchbot$ git trac push
Pushing to Trac #23847...
Guessed remote branch:
u/mantepse/make_the_experimental_fricas_package_optional
Traceback (most recent call last):
File "/usr/local/b
