Back to Browse

Vim screencast #77: Merge conflicts

7.9K views
Jun 14, 2019
16:10

Links: - vcs-jump: https://github.com/wincent/vcs-jump - "Understanding Git conflict markers": https://wincent.dev/wiki/Understanding_Git_conflict_markers - "Git merge conflict cheatsheet": https://wincent.dev/wiki/Git_merge_conflict_cheatsheet - "Understanding Mercurial conflict markers": https://wincent.dev/wiki/Understanding_Mercurial_conflict_markers - https://medium.com/prodopsio/solving-git-merge-conflicts-with-vim-c8a8617e3633 - Music: http://www.bensound.com/royalty-free-music - Other episodes: https://wincent.dev/j/vim-screencasts

Download

0 formats

No download links available.

Vim screencast #77: Merge conflicts | NatokHD