Feature Requests: multiple files, conflict notification, auto accept simple changes

[blainelewis1]

Not sure if you want to maintain or expand this plugin, it works great as is. But I had a couple ideas for features I might add at some point if I find I run into the issues often enough to get annoyed:

1. a new setting to auto accept pure addition / deletion conflicts.

• i.e., if I add some lines, I almost always want to add them
• If i delete some lines from one file it's really the same case as above, I almost always want them.
• Modifications are more complicated and usually always require manual editing.

2. handle multiple conflicts at once

• sometimes I get several conflicts like ABASD FDSFKD and BJASDL for a single file from all of my devices. I'm not sure how it happens but syncthing just didn't choose the right file to keep as the true file I think.
• I'd like to handle these all at once instead of separately. But it's easier said than done.
  • diff doesn't support multiple file diffs.
  • "collapsing" two diffs into one might be hard... But if there's a way to take two diffs orig,conflict1 and then orig,conflict2 and then combine those two then I think that would be really nice.
  • If not, just showing all of the diffs without collapsing diffs would be an improvement

3. Notify that a file has a conflict

• maybe just inline or something like that. Something simple just as a reminder.

4. Handle or notify of conflicts in the settings and plugins files.