5:26Resolve a Git Merge Conflict within Vim | Vim 🔥 Tips and TricksJosh Branchaud13.2K viewsView & Download
10:01🐱💻 using vim to fix git merge conflicts & trying out awesome curlShane Null86 viewsView & Download
6:38Comparing Files With Vim - Vim's Diff Mode - Vim Tips & TricksMarco Peluso6.6K viewsView & Download
27:07Git mastery in 20-minute increments: Merging and mergetoolNathaniel Whiteinge0 viewsView & Download
