On 27 July 2014 18:38, 'Paul Mercat' via sage-support
wrote:
> Thank you.
> In fact I didn't have git installed in my computer.
If you don't have git then I cannot see how you have a file with git
conflict markers in it.
> I will retry following the steps given in the developper guide, using gi
Thank you.
In fact I didn't have git installed in my computer.
I will retry following the steps given in the developper guide, using git.
I didn't know that the way you commit/push/pull/etc.. has changed since the
last version of sage.
I hope it will not change for each version of sage, because it
That is a git conflict marker. "git status" will tell you that you are
supposed to resolve the conflict.
On Sunday, July 27, 2014 11:30:59 AM UTC-4, Paul Mercat wrote:
>
> Hello,
>
> I have developped some tools that works well with several versions of
> sage, but it doesn't work well with sag
