I wanted to update my (current) sage 8.4-beta4 to beta6
Fetch works okay. Then :
charpent@asus16-ec:/usr/local/sage-8$ git status
Sur la branche develop
Votre branche est en retard sur 'origin/develop' de 652 commits, et peut
être mise à jour en avance rapide.
(utilisez "git pull" pour mettre à jour votre branche locale)
Fichiers non suivis:
(utilisez "git add <fichier>..." pour inclure dans ce qui sera validé)
src/sage/libs/cypari2/
(Note : I have had this one for a long time. It seems to be a sequel of a
booboo in Sages git history. It is probablu *not* relevant to my current
problem)..
aucune modification ajoutée à la validation mais des fichiers non suivis
sont présents (utilisez "git add" pour les suivre)
charpent@asus16-ec:/usr/local/sage-8$ git pull
error: cannot lock ref
'refs/remotes/origin/u/embray/python3/sage-rings-polynomial-polydict/misc':
'refs/remotes/origin/u/embray/python3/sage-rings-polynomial-polydict'
existe ; impossible de créer
'refs/remotes/origin/u/embray/python3/sage-rings-polynomial-polydict/misc'
Depuis git.sagemath.org:sage
! [nouvelle branche]
u/embray/python3/sage-rings-polynomial-polydict/misc ->
origin/u/embray/python3/sage-rings-polynomial-polydict/misc (impossible de
mettre à jour la référence locale)
I do not know how to proceed. Suggestions ?
--
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 https://groups.google.com/group/sage-devel.
For more options, visit https://groups.google.com/d/optout.
