Tag Info

Just 7 hours ago to Smerge was added a new command to do exactly that. Now you can use M-x smerge-vc-next-conflict to either jump to the next conflict in focused buffer or to the next conflicted file ...

Sure, the following function works for me to automatically resolve all conflicts inside a file: (defun smerge-resolve-all-in-file-to (to-keep) "Resolves all conflicts inside a file in ...

It looks like this will take effect if you restart Emacs. Alternatively, M-x load-library RET smerge RET will process it. (In which case the old prefix will also remain active, until you restart.)

smerge-command-prefix is used by smerge.el when the smerge.el file is loaded. So you need to perform your setq before smerge.el is loaded. My crystal ball tells me that you likely have something in ...

Good idea. Here's a next-conflict function that wraps around whenever there is no more conflicted files, but the current one still has conflicts: (defun next-conflict () (interactive) (let ((...

As far as I know, no smerge does not provide that functionality.

I think you're looking for M-x smerge-combine-with-next RET.

EDIT in response to your comment Seems like indeed configuring the smerge-begin-re, smerge-lower-re, and smerge-end-re as follows before you activate smerge-mode (setq-local smerge-begin-re "^#...

If you set or customize diff-refine to a non-nil value then smerge-refine is applied "automatically" in smerge-next. See the doc string of diff-refine for the valid values: If non-nil, ...

You can use M-x flycheck-mode to turn off flycheck in current buffer. Or alternatively, you can disable it for specific hooks (in this case smerge-mode): (add-hook 'smerge-mode-hook (lambda () (...

Magit does not support that currently, but I have just added a note to a related feature request.

Use C-c c-e in the vc-diff buffer to apply the diff to a file. Enter the target filename and press RET. This will launch ediff and attempt to apply the patch. For me, the patch applied successfully ...