Resolve Git Merge Conflicts with Neovim and Fugitive!

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: https://github.com/tpope/vim-fugitive
▶ Telescope: https://github.com/nvim-telescope/tel...
▶ Git signs: https://github.com/lewis6991/gitsigns...
▶ Git signs alternative for Vim / older Neovim versions: https://github.com/airblade/vim-gitgu...

SUPPORT THIS CHANNEL
https://www.buymeacoffee.com/omerxx

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: https://amzn.to/3HwJG60
🔗 The HHKB is wired with a high quality coiled cable: https://amzn.to/3DCA87d
⌨️ Backup keyboard (for traveling mainly) - Nuphy Air60: https://amzn.to/3R3M7jz
🖥️ My ultra wide 49" monitor: https://amzn.to/3JbVThC
🎙️ Microphone - HyperX Quadcast: https://amzn.to/3kLcNJR
🦾 Heavy Duty Monitor Arm: https://amzn.to/3kKp7tS
🖱️ Mouse - MX Master 3: https://amzn.to/3DiZmaj

Subscribe!
=======================================
Subscribe for more videos like this: https://www.youtube.com/@devopstoolbo...
My blog: https://omerxx.com
Dev & Ops tools Telegram channel: https://t.me/espressops

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 |   / user-356546060  
Music promoted by https://www.chosic.com/free-music/all/
Creative Commons CC BY 3.0
https://creativecommons.org/licenses/...