Tap to unmute

The HIDDEN Git Trick for Resolving Merge Conflicts

  Рет қаралды 20,715

DevOps Toolbox

DevOps Toolbox

Күн бұрын

Пікірлер: 35
@typecraft_dev
@typecraft_dev 7 ай бұрын
I'm a simple guy. I see Devops Toolbox, I hit the like button
@devopstoolbox
@devopstoolbox 7 ай бұрын
Ahhh a comment from the one and only! 💙
@anmol-fzr
@anmol-fzr 7 ай бұрын
Do not use github's logo as git's logo.!!
@clarkgriswald8575
@clarkgriswald8575 7 ай бұрын
This ^
@AlexVKapa
@AlexVKapa 6 ай бұрын
Today we learnt how to resolve simple merge conflict in 8 minutes... great job!
@BhEaN
@BhEaN 7 ай бұрын
Nice!! I didn't know this Git feature, thanks for sharing!
@Ulchie
@Ulchie 7 ай бұрын
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.
@devopstoolbox
@devopstoolbox 7 ай бұрын
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
@0x6664
@0x6664 7 ай бұрын
Great feature thanks for sharing. And thanks for getting one of our keyboard :)
@devopstoolbox
@devopstoolbox 7 ай бұрын
The Moonlander 👀? Is that you??
@0x6664
@0x6664 7 ай бұрын
@@devopstoolbox I work with ZSA, mainly on developing Oryx and Keymapp and some hardware stuff.
@0x6664
@0x6664 7 ай бұрын
@@devopstoolbox I work with ZSA, developing Oryx and Keymapp as well as some other hardware stuff.
@0x6664
@0x6664 7 ай бұрын
I work with ZSA, developing Oryx and Keymapp and some other hardware stuffs.
@brotein_mancakes
@brotein_mancakes 7 ай бұрын
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.
@devopstoolbox
@devopstoolbox 7 ай бұрын
Totally the worst name ever 😆 And yeah - I figured if I'm going to tent it lets go all the way :)
@mohmaster732
@mohmaster732 7 ай бұрын
How are you getting the tenting on your moonlander so high? I'd love to try that on my ergodox ez
@devopstoolbox
@devopstoolbox 7 ай бұрын
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
@mohmaster732
@mohmaster732 7 ай бұрын
@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
@devopstoolbox
@devopstoolbox 7 ай бұрын
@@mohmaster732 🙏🏽💪
@myusernameislongerth
@myusernameislongerth 7 ай бұрын
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?
@devopstoolbox
@devopstoolbox 7 ай бұрын
Meet bat! github.com/sharkdp/bat
@JMIK1991
@JMIK1991 7 ай бұрын
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.
@devopstoolbox
@devopstoolbox 7 ай бұрын
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
@PabloFernandezFranco
@PabloFernandezFranco 7 ай бұрын
Great video ! Watching here from Spain. I hope your Spanish learning is going well :)
@devopstoolbox
@devopstoolbox 7 ай бұрын
Haha por supuesto!
@vivgui
@vivgui 6 ай бұрын
whats terminal prompt config? it looks beautiful!
@devopstoolbox
@devopstoolbox 6 ай бұрын
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
@vivgui
@vivgui 6 ай бұрын
@@devopstoolbox thank you!
@ZilverDx
@ZilverDx 7 ай бұрын
Easy to remember this git command. BTW in spanish H is mutted which means it sounds like ola ;-)
@devopstoolbox
@devopstoolbox 7 ай бұрын
Ah! Good to know! Thanks :)
@jorge28624
@jorge28624 7 ай бұрын
git branch otra-rama
@Quephara
@Quephara 7 ай бұрын
Do you have a cold? It sounds like you do
@devopstoolbox
@devopstoolbox 7 ай бұрын
I DID! Still trying to figure whether it made my voice sexier 😆
@Markadown
@Markadown 7 ай бұрын
@@devopstoolbox can confirm
The Holy Grail of Neovim Git Integrations
13:28
DevOps Toolbox
Рет қаралды 44 М.
Git Worktrees and Neovim: A Match Made in Coding Heaven
9:53
DevOps Toolbox
Рет қаралды 32 М.
IL'HAN - Qalqam | Official Music Video
03:17
Ilhan Ihsanov
Рет қаралды 700 М.
СИНИЙ ИНЕЙ УЖЕ ВЫШЕЛ!❄️
01:01
DO$HIK
Рет қаралды 3,3 МЛН
Quando eu quero Sushi (sem desperdiçar) 🍣
00:26
Los Wagners
Рет қаралды 15 МЛН
Git MERGE vs REBASE: The Definitive Guide
9:39
The Modern Coder
Рет қаралды 132 М.
Git Better Than 95% of People
9:33
DevOps Toolbox
Рет қаралды 19 М.
30 Vim commands you NEED TO KNOW (in just 10 minutes)
10:27
typecraft
Рет қаралды 131 М.
Testcontainers have forever changed the way I write tests
12:11
Dreams of Code
Рет қаралды 123 М.
Five Terminal Applications I CAN'T Live Without
11:28
DevOps Toolbox
Рет қаралды 27 М.
Resolve Git MERGE CONFLICTS: The Definitive Guide
8:02
The Modern Coder
Рет қаралды 52 М.
I'm never using Git the same way again
11:19
typecraft
Рет қаралды 97 М.
So You Think You Know Git Part 2 - DevWorld 2024
23:02
GitButler
Рет қаралды 87 М.
SECRET Git Tricks No One Knows!
10:04
DevOps Toolbox
Рет қаралды 6 М.
IL'HAN - Qalqam | Official Music Video
03:17
Ilhan Ihsanov
Рет қаралды 700 М.