bug#74509: Feature request - smerge-mode

[Stefan Monnier]

>> # keybinding
>> would be nice to provide default keybinding for smerge-swap: C-c ^ s

Interesting.  I've never found a use for that command, personally.
Could you give some hint for the situations where you found it handy?

>> # smerge-extend
>> Helpful when user intent to keep both.

Sorry: to keep both what?

>> (defun smerge-extend ()
>>   "Copy the line directly following the conflict into both upper and lower 
>> sections.

Hmm... Why just one line and why only from the end?
[ IOW, here as well, I'm curious what is the kind of scenario where you
  use that command.  ]

>> This is useful when both versions need to share some common code that 
>> follows the conflict."

Hmm... my conflicts have usually 3 sections, so "both" isn't right.

[ Unless you specifically chose 2-way conflicts, I recommend you
  investigate how to get 3-way conflicts, because they give a lot more
  information and allow for example `smerge-resolve` to "just work" in
  more cases.  YMMV, but personally whenever I'm faced with a 2-way
  conflict, I'm frustrated.  ]


        Stefan