Salut,
j’ai tenté de mettre à jour un SPIP mutualisé via spip-cli spip up comme d’habitude mais j’ai une erreur. J’ai mis à jour spip-cli mais ça ne change rien.
Sur un autre hébergement similaire (même hébergeur, même config spip mutualisé), je n’ai pas ce soucis.
[INFO] spip dl git -b 4.4 https://git.spip.net/spip/spip.git -d .
Fetching origin
remote: Enumerating objects: 3, done.
remote: Counting objects: 100% (3/3), done.
remote: Compressing objects: 100% (3/3), done.
remote: Total 3 (delta 0), reused 0 (delta 0), pack-reused 0 (from 0)
Unpacking objects: 100% (3/3), 5.69 KiB | 5.69 MiB/s, done.
From https://git.spip.net/spip/spip
5f192668a..29948fe30 4.4 -> origin/4.4
[INFO] git pull --rebase
error: Pulling is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
Pour les plugins-dist, pas d’erreurs.
git status donne :
On branch 4.4
Your branch is behind 'origin/4.4' by 9 commits, and can be fast-forwarded.
(use "git pull" to update your local branch)
Unmerged paths:
(use "git restore --staged <file>..." to unstage)
(use "git add/rm <file>..." as appropriate to mark resolution)
deleted by them: htaccess.txt
Untracked files:
(use "git add <file>..." to include in what will be committed)
.htaccess
.user.ini
e6bec2014635c87902cded2d4a6c8a54.txt
lib/
mutualisation/
sites/
tmp/
no changes added to commit (use "git add" and/or "git commit -a")
J’ai supprimé htaccess.txt au cas où, mais ça n’est pas mieux.
Quelqu’un·e a une idée ?
