friebetill/obsidian-file-diff

Feature Request: Open original

wc8 opened this issue · 6 comments

wc8 commented

Thanks for this!

It would be handy if eventually the plugin could look for "sync-conflict" and open the related file name, i.e. the original to start a compare & merge.

ryanwwest commented

I second this, assuming I understand it correctly. At a wider level for Syncthing, it would be nice for it to autodetect conflicts and open up the diff resolver so you don't have to go figure out the filenames of conflicts.

wc8 commented

Yes, that's the idea.

  • 👍1
friebetill commented

I have extended the plugin by the command Find sync conflicts and merge. The commando finds all Syncthing conflicts and shows the merge option for each conflict sequentially.

wc8 commented

Thanks.

It would help to have an indicator of the page being worked on, as in some cases the correction to be accepted depends on the file. (Maybe the info is there and I'm missing it?).
Edit: in some cases it shows, in some cases it doesn't.

BTW, I'm no longer seeing the original commands in the command pallet only the new one, but maybe this was intentional and I'm misunderstanding the meaning of "extended".

friebetill commented

I showed the information which files are being differenced in the previous version, but had to deactivate it for now because I needed to make architecture changes based on the feedback of @liamcain. I am in dialogue with Liam to find a way to reactivate it.

You have to have an open file to see the first two options Compare and Compare and merge.

friebetill commented

The names of the files are now displayed in the title of the tab.

  • 👍1