Rebase with pull

[marcvanandel]

If there are any changes in the Git repo these should be synchronized to the SilverBullet instance as well. This enables not only 'sync' to a Git repo, but also 'sync' from this Git repo. All is good as long as all changes are committed.

The actual implementation should do a pull --rebase instead of just a pull

[ivanalejandro0]

I think that the default behavior for SilverBullet's git plug should be git pull --ff-only, not rebase, not merge. I imagine that a fast-forward should always work, and if it doesn't, that means that there's a problem that should be addressed somehow.

I imagine that for most people, the sole "user" of a git repo tracking SilverBullet's space is going to be SilverBullet's server and "managed" by this git plug.

Assuming that, I don't think that the git repo will ever be out of sync. The same server will always get latest updates and then push new ones on top of that.

There may be users editing notes outside SilverBullet, then pushing them to the repo, I've done that, but I think it would be rare, and hopefully those users should handle things accordingly.

For users that want to touch the repo outside SilverBullet, I think it would make sense to have a "custom sync" config where we could specify "merge" or "rebase" depending on preference/needs.

What do you think? maybe I'm making the wrong assumptions or I'm missing some use case.

[marcvanandel]

I like the "custom sync" config option at least. That would work for me.

My use case is that I use the repo for sync between multiple devices. So yes, just 'one' user but multiple usage 😉 And the main sync isn't working with just the fast forward option. The rebase will probably work more often (IMHO). At least this is what Logseq plugin is doing (and even the button is showing this). In the case of a single user with solo usage the rebase will work as good as just the fast forward, wouldn't it? So I don't see any harm (and only benefits) of using the rebase

[tomodachi94]

As a workaround, you can set pull.rebase to true in the repository settings using this command to rebase by default (sb-git seems to obey this):

git config pull.rebase true

A possible way to implement this could be a extraFlags/extraPullFlags/extraPushFlags configuration option, allowing for users to set flags that they want without having to create a configuration option for every single flag that a user might want to enable.