Merge conflicts are one of my biggest git-hates. I don't like them, and I'm probably not the only one. But what do you know, it turns out Fugitive (see my previous video if you're unfamiliar) has a solution! An interactive 3-way pane that helps us solve conflict with ease and breeze!
Tools in the video:
▶ Fugitive: [ Ссылка ]
▶ Telescope: [ Ссылка ]
▶ Git signs: [ Ссылка ]
▶ Git signs alternative for Vim / older Neovim versions: [ Ссылка ]
SUPPORT THIS CHANNEL
[ Ссылка ]
My Favourite Gear!
=======================================
* If you enjoy my content, using the links below will help me with a small commission, so thank you!
⌨️ My keyboard is the wonderful HHKB: [ Ссылка ]
🔗 The HHKB is wired with a high quality coiled cable: [ Ссылка ]
⌨️ Backup keyboard (for traveling mainly) - Nuphy Air60: [ Ссылка ]
🖥️ My ultra wide 49" monitor: [ Ссылка ]
🎙️ Microphone - HyperX Quadcast: [ Ссылка ]
🦾 Heavy Duty Monitor Arm: [ Ссылка ]
🖱️ Mouse - MX Master 3: [ Ссылка ]
Subscribe!
=======================================
Subscribe for more videos like this: [ Ссылка ]
My blog: [ Ссылка ]
Dev & Ops tools Telegram channel: [ Ссылка ]
Chapters:
=======================================
00:00 - Intro
00:28 - What happens in a coflict
02:04 - The 3-way split
02:47 - :diffget
04:00 - :diffput
04:44 - Full workflow
06:20 - Ways to review the changes
#neovim #devops #platformengineering #terminal #dev #git #cloud #cli #terminal #dev #ops #ricing #linux #macos #commandline #typing #keyboard
Music:
=======================================
Morning Station by Tokyo Music Walker | [ Ссылка ]
Music promoted by [ Ссылка ]
Creative Commons CC BY 3.0
[ Ссылка ]
