I'm a simple guy. I see Devops Toolbox, I hit the like button
@devopstoolbox7 ай бұрын
Ahhh a comment from the one and only! 💙
@anmol-fzr7 ай бұрын
Do not use github's logo as git's logo.!!
@clarkgriswald85757 ай бұрын
This ^
@AlexVKapa6 ай бұрын
Today we learnt how to resolve simple merge conflict in 8 minutes... great job!
@BhEaN7 ай бұрын
Nice!! I didn't know this Git feature, thanks for sharing!
@Ulchie7 ай бұрын
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.
@devopstoolbox7 ай бұрын
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
@0x66647 ай бұрын
Great feature thanks for sharing. And thanks for getting one of our keyboard :)
@devopstoolbox7 ай бұрын
The Moonlander 👀? Is that you??
@0x66647 ай бұрын
@@devopstoolbox I work with ZSA, mainly on developing Oryx and Keymapp and some hardware stuff.
@0x66647 ай бұрын
@@devopstoolbox I work with ZSA, developing Oryx and Keymapp as well as some other hardware stuff.
@0x66647 ай бұрын
I work with ZSA, developing Oryx and Keymapp and some other hardware stuffs.
@brotein_mancakes7 ай бұрын
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.
@devopstoolbox7 ай бұрын
Totally the worst name ever 😆 And yeah - I figured if I'm going to tent it lets go all the way :)
@mohmaster7327 ай бұрын
How are you getting the tenting on your moonlander so high? I'd love to try that on my ergodox ez
@devopstoolbox7 ай бұрын
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
@mohmaster7327 ай бұрын
@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
@devopstoolbox7 ай бұрын
@@mohmaster732 🙏🏽💪
@myusernameislongerth7 ай бұрын
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?
@devopstoolbox7 ай бұрын
Meet bat! github.com/sharkdp/bat
@JMIK19917 ай бұрын
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.
@devopstoolbox7 ай бұрын
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
@PabloFernandezFranco7 ай бұрын
Great video ! Watching here from Spain. I hope your Spanish learning is going well :)
@devopstoolbox7 ай бұрын
Haha por supuesto!
@vivgui6 ай бұрын
whats terminal prompt config? it looks beautiful!
@devopstoolbox6 ай бұрын
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
@vivgui6 ай бұрын
@@devopstoolbox thank you!
@ZilverDx7 ай бұрын
Easy to remember this git command. BTW in spanish H is mutted which means it sounds like ola ;-)
@devopstoolbox7 ай бұрын
Ah! Good to know! Thanks :)
@jorge286247 ай бұрын
git branch otra-rama
@Quephara7 ай бұрын
Do you have a cold? It sounds like you do
@devopstoolbox7 ай бұрын
I DID! Still trying to figure whether it made my voice sexier 😆