Git Upgrade of Friendica
!Friendica Support Hi, I want to upgrade my Friendica server.
I changed to `/var/www/friendica` and executed
`git config --global --add safe.directory /var/www/friendica`
then
`git pull`
`Updating f660c3894..2dbfb0700`
unfortunately, I got the:
`error: Your local changes to the following files would be overwritten by merge:
.codecov.yml
.editorconfig
.github/ISSUE_TEMPLATE/feature_request.md
.gitignore
...
Aborting`
My current version is Friendica 'Siberian Iris' 2022.03 - 1452.
What can I do?
Best, Robert
I changed to `/var/www/friendica` and executed
`git config --global --add safe.directory /var/www/friendica`
then
`git pull`
`Updating f660c3894..2dbfb0700`
unfortunately, I got the:
`error: Your local changes to the following files would be overwritten by merge:
.codecov.yml
.editorconfig
.github/ISSUE_TEMPLATE/feature_request.md
.gitignore
...
Aborting`
My current version is Friendica 'Siberian Iris' 2022.03 - 1452.
What can I do?
Best, Robert
Roland Häder likes this.
Friendica Support reshared this.
xy..
in reply to Robert Winkler • • •Friendica Support reshared this.
Robert Winkler
in reply to Robert Winkler • •fatal: detected dubious ownership in repository at '/var/www/friendica'
To add an exception for this directory, call:
git config --global --add safe.directory /var/www/friendica
Friendica Support reshared this.
Roland Häder
in reply to Robert Winkler • • •git
asroot
! That's dangerous to do.Robert Winkler likes this.
Friendica Support reshared this.
Robert Winkler
in reply to Roland Häder • • •Roland Häder likes this.
Friendica Support reshared this.
Roland Häder
in reply to Robert Winkler • • •haeder.net
) I have a "virtual user", e.g.vuXXXX
by XXXX is a 4-digit number. If I need shell access to it, I login as a normal user to my server, then runsudo su - vuXXXX
to change into that user and then change to the sub domain's path. Then there I executegit pull
and so on.Robert Winkler likes this.
Friendica Support reshared this.
Robert Winkler
in reply to Robert Winkler • • •Friendica Support reshared this.
Robert Winkler
in reply to Robert Winkler • • •Roland Häder likes this.
Friendica Support reshared this.
Robert Winkler
in reply to Robert Winkler • • •@Robert Winkler@Fabio I tried method 1 (no:), but now my instance is not funcional anymore:
"This page isn’t working mexico-pensante.blog is currently unable to handle this request.
HTTP ERROR 500"
the config looks fine (admin email, SQL).
from /var/mail/root:
"PHP Warning: require(/var/www/friendica/vendor/composer/../../boot.php): failed to open stream: No such file or directory in /var/www/friendica/vendor/composer/autoload_real.php on line 69
PHP Fatal error: require(): Failed opening required '/var/www/friendica/vendor/composer/../../boot.php' (include_path='.:/usr/share/php') in /var/www/friendica/vendor/composer/autoload_real.php on line 69
"
Any idea?
Friendica Support reshared this.