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 de…

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!

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… :slight_smile: So thanks for BOTH: find and fixing the error and for the great function!

Thanks for sharing! I never thought about using the pageCreating event to display custom temporary pages.

[image] Lennart Ochel: :package: Grab it here https://gist.github.com/lochel/22f739cb4f65e586e4df49932bc453b9 Hey, this link isn't working for me, any chance to get that code still? Are you still using it? Thank you in advance :slight_smile:

Widget widgets = widgets or {} -- Widget to detect and display links to conflicted page versions function widgets.conflicts(options) options = options or {} -- Get the current page name, and strip off any `.conflicted.<number>` suffix local pageName = editor.getCurrentPage() if pageName:ma…

If you want to reuse diff mechanism of my git plugin. I work fine [image] [SPACE-LUA] Addon with missing Git commands (history, diff, restore) Plugs and Libraries [git] Git History Module bullseye Description This module adds full Git integration into SilverBu…

Conflicted Pages: Widget & Diff Viewer

Tricks & Techniques

malys (Malys) March 22, 2026, 7:25am 7

If you want to reuse diff mechanism of my git plugin. I work fine