Media Summary: Links: - vcs-jump: - "Understanding Git conflict markers": ... Links: - vcs-jump: - git-jump: - Dot files: ... Dot files: - EditorConfig: - Registering the FileType autocmd: ...
Vim Screencast 77 Merge Conflicts - Detailed Analysis & Overview
Links: - vcs-jump: - "Understanding Git conflict markers": ... Links: - vcs-jump: - git-jump: - Dot files: ... Dot files: - EditorConfig: - Registering the FileType autocmd: ... Resolve conflict markers as a simple two-way diff. Phone bank for Defend the Guard: Sign up for our ... Links: - Dot files: - Karabiner config generator: ...
