Emacs: use SMERGE and EDIFF to resolve file conflicts
In this video I run a real-world scenario of a failed merge in a Git-controlled project. The idea is that one branch cannot be merged cleanly into the other because there are conflicting differences between a few files. Git cannot choose on its own, so it is leaving things to us.
This is where
ediff can into the picture. Both
tools are built into Emacs and can be used in tandem with Magit or the
standard Version Control framework (VC). The workflow is practically
Check my dotemacs for more on these.