The HIDDEN Git Trick for Resolving Merge Conflicts
Vložit
- čas přidán 29. 06. 2024
- 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: learn.omerxx.com/courses/seco...
📰 Become a better engineer in just 3 minutes a week: signup.omerxx.com
⌨️ Tech I use: kit.co/omerxx/my-battle-station
LINKS
▶ git-scm.com/book/en/v2/Git-To...
▶ Dotfiles: 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 - Věda a technologie
I'm a simple guy. I see Devops Toolbox, I hit the like button
Ahhh a comment from the one and only! 💙
Today we learnt how to resolve simple merge conflict in 8 minutes... great job!
Nice!! I didn't know this Git feature, thanks for sharing!
This was making me a bit squeamish until I saw that it didn't just move on through the rebase when using the previous resolution. Nice feature that thankfully is not entirely automated. Definitely the right call by the implementers.
I agree. Until figuring it stops I was a little puzzled / worried about unwanted results but it's pretty simple if you look under the hood
Do not use github's logo as git's logo.!!
This ^
Nice video. I’d never heard of git rerere (the name of the command does not roll of the tongue tho… ha). I’m looking forward to trying this out. Thanks!
Btw your Moonlander tenting game is strong. I’ve got the tenting kit on mine but haven’t gone too far with it yet.
Totally the worst name ever 😆
And yeah - I figured if I'm going to tent it lets go all the way :)
Great video ! Watching here from Spain. I hope your Spanish learning is going well :)
Haha por supuesto!
Great feature thanks for sharing. And thanks for getting one of our keyboard :)
The Moonlander 👀?
Is that you??
@@devopstoolbox I work with ZSA, mainly on developing Oryx and Keymapp and some hardware stuff.
@@devopstoolbox I work with ZSA, developing Oryx and Keymapp as well as some other hardware stuff.
I work with ZSA, developing Oryx and Keymapp and some other hardware stuffs.
Easy to remember this git command. BTW in spanish H is mutted which means it sounds like ola ;-)
Ah! Good to know! Thanks :)
I like simple things, including merger errors.
If it happens, I've done something really wrong, or I'm not alone.
They are not scary, and I should always know about it, as it tells things are working correctly.
If you watched you know you’ll always be aware of the mistake, the resolving change is also pointed out and never comited for you… more of a suggestion than an auto-fix
How are you getting the tenting on your moonlander so high? I'd love to try that on my ergodox ez
I got the platform kit from ZSA. There are plenty of community templates you can 3D print but I decided to went with the robust solution. It's a little pricy but I love it
@devopstoolbox awesome I'll check that out. Thank you, and I really enjoy your videos! I've referenced your dotfiles quite a few times while fleshing out my neovim config
@@mohmaster732 🙏🏽💪
what makes your cat do all that - line numbers, syntax highlight? is that something else that you call cat? I know cat -n does the line numbers, but rest?
Meet bat!
github.com/sharkdp/bat
whats terminal prompt config? it looks beautiful!
Thanks! This is starship! I have a video covering its configuration but if you want to just see mine it's here - dotfiles.omerxx.com
@@devopstoolbox thank you!
git branch otra-rama
Do you have a cold? It sounds like you do
I DID! Still trying to figure whether it made my voice sexier 😆
@@devopstoolbox can confirm