An amazing screencast which makes 3-way merging much easier.
http://vimcasts.org/episodes/fugitive-vim-resolving-merge-conflicts-with-vimdiff/
Related topics
| Topic | Replies | Views | Activity | |
|---|---|---|---|---|
| The powers of Git | 0 | 733 | May 16, 2016 | |
| Vim anti patterns | 1 | 951 | October 7, 2016 | |
| Note taking using Vim | 0 | 1445 | August 13, 2016 | |
| Request: Code walkthrough from core team, and improved guidance on how to contribute | 10 | 694 | October 6, 2022 | |
| Introducing Asanawarrior | 5 | 2389 | September 19, 2016 |