ibizaman / emacs-conflict Goto Github PK

The unquoted symbol emacs-conflict--conflict-history in the function emacs-conflict--pick-a-conflict causes errors in Spacemacs when using Helm or Ivy. Quoting the symbol solves the error when using Ivy, but not when using Helm. Removing the symbol fixes functionality for both Ivy and Helm.
As it appears that this symbol does not add functionality, it might be better to just remove it.

Just a small thing :)

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 conflict and first notices it a bit later, I find it problematic to delete the conflict file right-away. Currently, emacs-conflict-resolve-conflicts asks whether to delete after quitting ediff. If one doesn't delete it, it will of course be presented again for resolving, which one doesn't want either.

My suggestion would be that in addition to delete or not delete there is another option, "archive" or "trash" (or both). It would move the conflict file to the trash or to a configurable directory.
Or it renames myfile.sync-conflict-xxx.org to myfile.sync-conflict-xxx-resolvedYYYYMMDD-HHMMSS.org, which has the advantage that the file can be kept in the same directory without being recognized as a conflict (when adapting the regex accordingly).

With this, after resolving a conflict, the function could ask for (a)rchive, (t)rash, (d)elete, (k)eep.
There should also be a variable where one can set the choice permanently, where I can imagine that "trash" or "archive" would be the preferable choices.

Now if one messed up a resolving and the file is in the archive or the trash, one can simply use ediff manually with it, or in the case of renamed files, there could be a special function that searches for "resolved" conflict files instead of new conflict files.

As a bonus, there would be a cleanup function which deletes (or trashes) archived/resolved conflict files when they become too old or exceed a certain number per file. This function could be called (optionally) after each call to emacs-conflict-resolve-conflicts.