Skip to main content


Friendica 2021.09 released


Can i "uodate" from 2021.09 Dev to 2021.09 stabel?
Updating fd37a5767..255b98b5b
error: Your local changes to the following files would be overwritten by merge:
.drone.yml
.github/workflows/releases.yml
CHANGELOG...
src/Module/Api/Mastodon/Unimplemented.php
src/Module/Attach.php
src/Module/BaseAdmin.php
src/Module/BaseApi.php
src/Module/B
Aborting

Is these correct, sorry its my first update. Thats after "git pull
Please run git checkout -- . first to reset all your unwarrantedly modified files first.
This entry was edited (3 weeks ago)
@Hypolite Petovan
git checkout β€” . is not working
git checkout:
Your branch is behind 'origin/develop' by 624 commits, and can be fast-forwarded.
(use "git pull" to update your local branch)
root@Friendica:/var/www/friendica git pull
Updating fd37a5767..255b98b5b
error: Your local changes to the following files would be overwritten by merge:
.drone.yml
.github/workflows/releases.yml
CHANGELOG
@Olaf @Hypolite Petovan hyphen hyphen, not long dash helpfully transformed by input filters =)
@Olaf @Hypolite Petovan The full stop is important:
git checkout -- .
Otherwise a hard reset achieves the same untainted worktree as well:
git reset --hard

Dausacker reshared this.

@Claes Wallin πŸ‡ΈπŸ‡ͺπŸ‡­πŸ‡° @Hypolite Petovan
thanks that worked. butt i'm now on 2021.12 dev i forgott to switch to stable after git pull. so long, hope it works :-)
For the moment stable and develop are very similar, you can still switch back to stable with no negative consequences.
@Olaf @Hypolite Petovan @Claes Wallin πŸ‡ΈπŸ‡ͺπŸ‡­πŸ‡° develop is currently three pull requests ahead of stable none has changed the database structure (which is the main block to reverting to an older version) so, you can just git checkout stable and switch to the stable version.
Fiendica is the evil twin of Friendica. 😈
Known Issues update:

Update Mon Oct 4th: A node-specific config/local.config.php file has been inadvertently included in the full archive. Please make sure you either remove it or overwrite it with your own when you perform the update as described above.

2 people reshared this

Wir nutzen nur fΓΌr den Betrieb der Webseite erforderliche Cookies.

⇧