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