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:

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!

Subscribe!
=======================================

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:
=======================================
Creative Commons CC BY 3.0

[chriswolf]

I didn't realize you could view your commits and preview the diffs with Telescope! Learned something new today! Thanks!

[dieduch]

Thanks, this was a really nice and concise demo! Was looking for something like this.

[annusingh]

Your videos are packed with a lot ammo (info). Thanks!

[surajthakkar]

Loving all these videos….please dont stop posting

[ascourter]

Great video! I found that when viewing Git log you can hit O to open the diff in a new tab or o to open it in a new split.

[adics]

How about I want to take some line of changes from target branch and feature-branch (usually called 'take both')

[RafaLeyvaRuiz]

How do you deal with combinig changes from both versions?

[chenle]

Very nice content! What is your tool to show keystrokes?

[nraw_]

Thanks, this was pretty cool! How would you see all the conflicts in the merge? How would you jump in between the conflicted files?

[ryan_forte]

Great vid. What are you using to make your bash prompt look like that?

[iduran]

Nice videos. Thanks! Do you have a video on your keyboard or can you share which keyboard you are using.

[xdgdpch]

I can not find a better tool than fugitive to do the 3-way merge. Have you ever tried neogit or diffview can do that? If it can, it my left fugitive and move to full lua config. Thank you!

[ishaankapoor]

How do you record them in this fashion, I mean having a semitransparent terminal with bg video

[israelssantanna]

Thanks for the video!
I personally use lazygit, it is very very useful and simple to use!
Have you try it yet?

[MrChickenpoulet]

ah didn't know fugitive could also help with conflicts, even after using it for years :D
I'd like to suggest to use the `:G` command instead of `:Git`, find it faster as it's two keystrokes less (and is available by default)!

[Yuri-cxbx]

How do u select only specific lines and not full chunk.

[dominiquekostler]

A video on git rebase would be nice :)

[NicolasRuizX]

The only reason why I still use vscode to resolve conflicts is because this doesn't let you pick both changes, most of the conflicts that I have working on a large company is when git is stupid and I really need both changes to then refactor some code. If it wasn't for that I would've uninstall vscode ages ago. If you have a solution please share. Nice content btw love your channel <3

[boredseason]

What do you do if you want both changes from HEAD and the merge branch?

[jt]

Lol all the times I closed a PR just to open a new one to copy over all my "feelsbad"