The HIDDEN Git Trick for Resolving Merge Conflicts
This handy trick, that even Git's docs consider "hidden", could have saved me so much frustration in the past... Better late than never I guess: meet Git "rerere".
Ways to support this channel:
🎓 My course: https://learn.omerxx.com/courses/seco...
📰 Become a better engineer in just 3 minutes a week: https://signup.omerxx.com
⌨️ Tech I use: https://kit.co/omerxx/my-battle-station
LINKS
▶ https://git-scm.com/book/en/v2/Git-To...
▶ Dotfiles: https://github.com/omerxx/dotfiles
⏱ Timestamps
00:00 - Intro
01:14 - Configuration
01:35 - Walk through
06:10 - Under the hood
07:11 - Merge conflicts with Vim
#neovim #git #neogit #lazygit #terminal #vim #dev #devops #linux #console
