Media Summary: Links: - vcs-jump: - git-jump: - Dot files:Β ... ... merge show you that there's a conflict and then use git This handy trick, that even Git's docs consider "hidden", could have saved me so much frustration in the past... Better late thanΒ ...

Vim Screencast 77 Merge Conflicts - Detailed Analysis & Overview

Links: - vcs-jump: - git-jump: - Dot files:Β ... ... merge show you that there's a conflict and then use git This handy trick, that even Git's docs consider "hidden", could have saved me so much frustration in the past... Better late thanΒ ... Dot files: - EditorConfig: - Registering the FileType autocmd:Β ... If this visual learning style clicks for you, I built LearnGit.io to be a more complete curriculum focusing on how Git actually works. In this short video, I walk you through how I resolve

Photo Gallery

Vim screencast #77: Merge conflicts
Vim screencast #78: Language Server Protocol
Using Vimdiff as a Git Mergetool - Vim Tips & Tricks
Resolve Git Merge Conflicts with Neovim and Fugitive!
Vim screencast #76: vcs-jump
Linediff.vim and Merge Conflicts
diffconflicts - A better Vimdiff Git mergetool
πŸ±β€πŸ’» using vim to fix git merge conflicts  & trying out awesome curl
The HIDDEN Git Trick for Resolving Merge Conflicts
Resolve a Git Merge Conflict within Vim | Vim πŸ”₯ Tips and Tricks
Vim screencast #79: Project-specific overrides
The 2 Types of Git Merge Conflicts Explained & Fixed
Sponsored
Sponsored
View Detailed Profile
Sponsored
Sponsored