I don’t often have occasion to resolve git merge conflicts so I never remember the details and end up changing things by hand. This tweet
C-c ^ m (smerge-keep-mine)…
Resolving conflicts with #emacs https://t.co/kNa6bDc2kG— (@milanthapa_) October 16, 2016
caught my attention so I followed the link and read about smerge. It’s a lighter weight solution than ediff and thus easier to use. I hardly ever use ediff so I always have to figure things out when I do. That’s not really what you want to be doing in the middle of resolving a merge conflict so smerge is perfect for me because there’s not much to remember. All you have to do is press Return while the point is on an unresolved file and you enter smerge-mode.
I really should take the time to get proficient with ediff but until I do, smerge is an easy way to resolve conflicts without invoking the heavy machinery of ediff.