emacs-conflict

emacs-conflict copied to clipboard

Implement renaming to/from conflict.

1

### Intro I had made [my own repo](https://github.com/tuh8888/syncthing.el) for fixing syncthing conflicts with ediff. I like your approach much better, but there is one bit of functionality I wanted to...

tuh8888

Backup or trash conflict file instead of remove

3

Thank you for this very useful tool! I have a suggestion regarding the deletion of conflict files. As it can easily happen that one does a mistake when resolving a...

felixwiemuth

Add rudimentary support for working with the Syncthing API

1

This lets us ask Syncthing for which directories we should search for conflicts in. This also alters the `emacs-conflict-resolve-conflicts` call to make the directory optional. If not provided, all directories...

Olivia5k

Fix default find regexes

3

Fuck, sorry, I broke things yesterday with the Syncthing regex.`emacs-conflict--get-normal-filename` wouldn't return the file extension for files WITH an extension, but would work fine for files without. This now works...

zemja