Skip to main content


Friendica 2021.09 released


in reply to Friendica News

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

This entry was edited (3 years ago)
in reply to Olaf von Bachgau.Social

Please run git checkout -- . first to reset all your unwarrantedly modified files first.
This entry was edited (3 years ago)
in reply to Hypolite Petovan

@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
in reply to Olaf von Bachgau.Social

@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.

in reply to Olaf von Bachgau.Social

For the moment stable and develop are very similar, you can still switch back to stable with no negative consequences.
in reply to Olaf von Bachgau.Social

@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.
in reply to Friendica News

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.

reshared this

in reply to hoergen

Express delivery! 😆


Uns’re Post ist immer noch
riesig auf dem Posten.
Für das liebe Publikum
scheut sie keine Kosten.
Jeden Brief, den schickt sie prompt,
kaum ’ne Stunde geht er,
bloß ein wicht’ger Eilbrief kommt
zwanzig Jahre später.

--Otto Reutter, 1929

in reply to hoergen

@hoergen there must have been some interaction with the original posting or a comment, that lead to nodes refetching the conversation. The posting was not re-posted to Twitter, so it was not "re-send".
in reply to Hypolite Petovan

@Hypolite Petovan to automatically ignore new comments to very old (being configured by the users) conversations. This one had been deleted from my node (by expiration time passed) but was re-fetched into the "Latest Post" network tab, by an activity somewhere in the thread.
Unknown parent

Hypolite Petovan

@Andy H3

liking old posts should not should not bring them up at all


This double negative is confusing 😵