Conflicted Pages: Widget & Diff Viewer

lochel · May 7, 2025, 6:18pm

I’ve put together a little widget that lists any conflicted pages in your SilverBullet instance, with direct links to view the diffs.

When you open a specific diff page, it shows:

The actual diff
Buttons to delete the conflicted page or apply the diff which will overwrite the original page and delete the conflicted page

Heads-up

Since this widget deletes and overwrites pages, there’s some risk involved if something doesn’t work as expected. That said, it’s been working smoothly for me so far - no issues yet.

Requirements

This script depends on the changes introduced in this PR which was merged about an hour ago. So make sure your SilverBullet instance is up to date.

Grab it here

gist.github.com

https://gist.github.com/lochel/22f739cb4f65e586e4df49932bc453b9

Conflicts.md

#meta

## Widget
```space-lua
-- Initialize widget table if it doesn't already exist
widgets = widgets or {}

-- Widget to detect and display links to conflicted page versions
function widgets.conflicts(options)
  options = options or {}

This file has been truncated. show original

LumenYoung · May 7, 2025, 7:00pm

Thanks! I was thinking lately to implement a command to embed diff block into current page to solve the long standing issue of comflict resolving in SB. But TBH widget seems to be really a better option. Will try when I got time!

zeus-web · May 7, 2025, 9:06pm

Thank you very much! Works like a charm so far.

In fact, I was also experimenting with the diff command before and could not get it to work. From your PR I learned, why…

So thanks for BOTH: find and fixing the error and for the great function!

janssen-io · May 8, 2025, 6:13am

Thanks for sharing!

I never thought about using the pageCreating event to display custom temporary pages.