search

floccusaddon / floccus

:cloud: Sync your bookmarks privately across browsers and devices
https://floccus.org
Mozilla Public License 2.0
5.85k stars 241 forks source link

Push rejected because it was not a simple fast-forward. Use "force: true" to override. #1688

Closed eglimpse closed 3 months ago

eglimpse commented 3 months ago

Which version of floccus are you using?

5.2.5

How many bookmarks do you have, roughly?

10k

Are you using other means to sync bookmarks in parallel to floccus?

No

Sync method

Git

Which browser are you using? In case you are using the phone App, specify the Android or iOS version and device please.

Chromium Version 127.0.6533.89 (Official Build, ungoogled-chromium) (64-bit)

Which version of Nextcloud Bookmarks are you using? (if relevant)

No response

Which version of Nextcloud? (if relevant)

No response

What kind of WebDAV server are you using? (if relevant)

No response

Describe the Bug

"Push rejected because it was not a simple fast-forward. Use "force: true" to override."

Pushing to local Bonobo Git Server Repository I specifically just set up for this today. I'm a new user of this extension.

Here's my single profile export.

[ { "localRoot": "0", "strategy": "default", "syncInterval": 15, "nestedSync": false, "failsafe": true, "allowNetwork": true, "label": "BookmarksSyncErikglimpse", "errorCount": 1, "clickCountEnabled": false, "type": "git", "url": "http://localhost/Bonobo.Git.Server/BookmarksSyncErikglimpse.git", "username": "bookmarksUser", "password": "HIDDEN", "branch": "main", "bookmark_file": "bookmarks.xbel", "bookmark_file_type": "xbel", "includeCredentials": false, "allowRedirects": false, "force": true, "enabled": false, "syncing": false, "scheduled": false, "error": "Push rejected because it was not a simple fast-forward. Use \"force: true\" to override." } ]

Here's my log:

2024-08-03T01:30:40.148Z Starting sync process for account BookmarksSyncErikglimpse 2024-08-03T01:30:40.188Z onSyncStart: begin 2024-08-03T01:30:40.188Z (git) init 2024-08-03T01:30:40.196Z (git) fetch from remote 2024-08-03T01:30:40.250Z (git) writeFile /846c731431f5e5eca257c0dbe6af506d6b35249e73956b3d2d5ffb5c818831b11722648640188//README.md 2024-08-03T01:30:40.250Z (git) add . 2024-08-03T01:30:40.252Z (git) commit 2024-08-03T01:30:40.256Z (git) push 2024-08-03T01:30:40.299Z onSyncFail 2024-08-03T01:30:40.300Z Syncing failed with Push rejected because it was not a simple fast-forward. Use "force: true" to override. 2024-08-03T01:30:40.300Z onSyncFail

Expected Behavior

It should perform the first initial commit of all my bookmarks.

To Reproduce

Set up new Floccus Profile with a new Bonobo Git Server Repository on Windows 11 with Chromium.

Debug log provided

github-actions[bot] commented 3 months ago

Hello :wave:

Thank you for taking the time to open this issue with floccus. I know it's frustrating when software causes problems. You have made the right choice to come here and open an issue to make sure your problem gets looked at and if possible solved. I'm Marcel and I created floccus and have been maintaining it ever since. I currently work for Nextcloud which leaves me with less time for side projects like this one than I used to have. I still try to answer all issues and if possible fix all bugs here, but it sometimes takes a while until I get to it. Until then, please be patient. Note also that GitHub is a place where people meet to make software better together. Nobody here is under any obligation to help you, solve your problems or deliver on any expectations or demands you may have, but if enough people come together we can collaborate to make this software better. For everyone. Thus, if you can, you could also have a look at other issues to see whether you can help other people with your knowledge and experience. If you have coding experience it would also be awesome if you could step up to dive into the code and try to fix the odd bug yourself. Everyone will be thankful for extra helping hands! One last word: If you feel, at any point, like you need to vent, this is not the place for it; you can go to the forum, to twitter or somewhere else. But this is a technical issue tracker, so please make sure to focus on the tech and keep your opinions to yourself.

I look forward to working with you on this issue Cheers :blue_heart:

marcelklehr commented 3 months ago

Mmh, Floccus seems to first think that the branch does not exist, but when pushing it does exist already. I assume this error persists when retrying? What is the state of the repository exactly?

eglimpse commented 3 months ago

It doesn't appear that Bonobo Git Server is actively being supported, and it might lack what is required to exchange data with Floccus. I just set up Gitea, and it's a much better experience in general for a self-hosted Git server. And it works very well with Floccus, as long as you set up a key for the user, and use it instead of a password in the Floccus profile setup. Otherwise you'll have to directly log into the Gitea web interface through the specific Chromium profile to enable syncing to the Gitea Git server with Floccus. Not sure if that was intended or no, but adding and using a key instead of a password in Gitea resolves this issue. You should be able to close this issue, since Bonobo is basically dead and too technically limited potentially.

marcelklehr commented 3 months ago

Yes, for most git services you will need to create an access token for floccus, that is expected :) I'm glad you got it to work!