chris/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

trying to fix

Browse source
This commit is contained in:
Chris Cochrun 2022-01-03 12:41:35 -06:00
parent fa407dfeb6
commit e013d7569e
22945 changed files with 447936 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

18
var/elfeed/db/data/97/978d2e701a340531d0e40807cd9f46f8e364ad40 Normal file
View file

@ -0,0 +1,18 @@
<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>