18 lines
810 B
Plaintext
18 lines
810 B
Plaintext
|
|
|
|
<p>Raw link: <a href="https://www.youtube.com/watch?v=9S2pMZ6U5Tc">https://www.youtube.com/watch?v=9S2pMZ6U5Tc</a></p>
|
|
|
|
<p>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.</p>
|
|
|
|
<p>This is where <code>smerge-mode</code> and <code>ediff</code> 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
|
|
the same.</p>
|
|
|
|
<p>Check <a href="https://protesilaos.com/emacs/dotemacs">my dotemacs</a> for more on these.</p>
|
|
|
|
|