Speaker Name: Gold Ayan
About the talk: We will look into resolving conflicts in emacs using VC-Git
#emacs
- Resources
- Resolving Conflicts (Magit User Manual)
- Emacs is the best merge tool for Git | Chen's blog
- Resolving Merge Conflicts in Emacs | skybert.net
** Youtube - [[https://www.youtube.com/watch?v=9S2pMZ6U5Tc][Emacs: resolve Git conflicts with SMERGE and EDIFF]]
- [[https://www.youtube.com/watch?v=f_xMuOK0FuQ][@rae: How emacs makes merging ridiculously easy]]