Backup or trash conflict file instead of remove about emacs-conflict HOT 3 OPEN

Thanks that would be really nice!
Maybe for the beginning changing delete for trash would be a quick first step.

from emacs-conflict.

That’s a good idea! I don’t know when I’ll have time to work on all this but I’ll try to at least take a pass at having an archive / trash / rename feature.

from emacs-conflict.

I also noticed that conflict files deleted by emacs-conflict-resolve-conflicts still show up under recent buffers, which is not the case for files deleted with spacemacs/delete-file, which I otherwise use. If I execute delete-file (as used by this script) interactively, it asks whether to trash but then just clears the file content, keeping the empty file, which again is another behaviour.

Looking at the documentation for delete-file, I discovered that it has a trash argument, which might be useful here:

(delete-file FILENAME &optional TRASH)

Probably introduced at or before Emacs version 1.6.

This function has :before advice: ‘delete-file-projectile-remove-from-cache’.

Delete file named FILENAME. If it is a symlink, remove the symlink.
If file has multiple names, it continues to exist with the other names.
TRASH non-nil means to trash the file instead of deleting, provided
‘delete-by-moving-to-trash’ is non-nil.

When called interactively, TRASH is t if no prefix argument is given.
With a prefix argument, TRASH is nil.

from emacs-conflict.