DevOps Toolbox
DevOps Toolbox
  • Видео 79
  • Просмотров 1 390 978
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: learn.omerxx.com/courses/second-brain-neovim
📰 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-Tools-Rerere
▶ 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
Просмотров: 5 829

Видео

Build FASTER Using Git Trees, Neovim and LazyGit
Просмотров 7 тыс.19 часов назад
Knowing the processes behind git, and how operations use them is crucial for speed. Avoiding merge commits can improve build times and make you (or your DevOps teams) life's better, and who doesn't want that? Ways to support this channel: 🎓 My course: learn.omerxx.com/courses/second-brain-neovim 📰 Become a better engineer in just 3 minutes a week: signup.omerxx.com ⌨️ Tech I use: kit.co/omerxx/...
Git Rebase --interactive: EXPLAINED
Просмотров 4,1 тыс.14 дней назад
This is a slightly different style I'm testing. This video took long DAYS to creates so if you're reading this please leave a comment with some feedback - was it helpful? Fun to watch? Ways to support this channel: 🎓 My course: learn.omerxx.com/courses/second-brain-neovim 📰 Become a better engineer in just 3 minutes a week: signup.omerxx.com ⌨️ Tech I use: kit.co/omerxx/my-battle-station LINKS ...
The Greatest Linux Hack Story of All Times
Просмотров 2,5 тыс.21 день назад
I think by this time almost everyone had head of the XZ hack, so I wanted to dive deeper in an interesting way into the details, the how, what, the story behind it and how things went down, in something that could literally effect the world if not for one great engineer. Ways to support this channel: 🎓 My course: learn.omerxx.com/courses/second-brain-neovim 📰 Become a better engineer in just 3 ...
3 Methods I Use to Customize Tmux Like a PRO
Просмотров 4,3 тыс.28 дней назад
Tmux is incredible, but you already know that. Amongst many features, one of the cool things about it is its extendability - writing plugins can be as easy as one short script, or you can write a full blown project and open source it, so it can be install-able with something like TPM. In this video I'll be covering all the options for creating your own plugins! This video is kindly sponsored by...
I Went Mouse-Less For 30 Days
Просмотров 9 тыс.Месяц назад
When it comes to Neovim and Git, there isn't one tool to rule them all, but with modern developments, I believe this setup comes close to perfection! Ways to support this channel: 🎓 My course: learn.omerxx.com/courses/second-brain-neovim 📰 Become a better engineer in just 3 minutes a week: signup.omerxx.com ⌨️ Tech I use: kit.co/omerxx/my-battle-station LINKS ▶ Home row mods: precondition.githu...
Deploy Your Own Productivity System Using Containers
Просмотров 3,5 тыс.Месяц назад
In this video, we explore AFFiNE, a local-first platform that empowers users with complete control over their data while providing rich editing features for managing knowledge. Highlights of AFFiNE include its seamless offline collaborative editing capabilities, a user-friendly interface for creating and organizing content, and the option to sync files online through AFFiNE Cloud for greater ac...
The Holy Grail of Neovim Git Integrations
Просмотров 25 тыс.2 месяца назад
When it comes to Neovim and Git, there isn't one tool to rule them all, but with modern developments, I believe this setup comes close to perfection! Ways to support this channel: 🎓 My course: learn.omerxx.com/courses/second-brain-neovim 📰 Become a better engineer in just 3 minutes a week: signup.omerxx.com ⌨️ Tech I use: kit.co/omerxx/my-battle-station LINKS ▶ Neogit: github.com/NeogitOrg/neog...
Hidden Tmux POWER: The Missing 50%
Просмотров 18 тыс.2 месяца назад
There's no really good way to control sessions in Tmux and that's a shame! Such a powerful concept without a proper interface. So I created one! Introducing - Tmux-SessionX. github.com/omerxx/tmux-sessionx Ways to support this channel: 🎓 My course: learn.omerxx.com/courses/second-brain-neovim 📰 Become a better engineer in just 3 minutes a week: signup.omerxx.com ⌨️ Tech I use: kit.co/omerxx/my-...
Rethinking Neovim as a Tool For Writers
Просмотров 15 тыс.3 месяца назад
If you're already invested into Neo/Vim, you know all the motions, move life fire when editing text. What's the point in ditching it when actually editing longer pieces of text? I mean, essays, blogs, notes, any text that isn't an actual phone text, would be easier in Vim (or with it's motions) then Notion or Apple notes or what have you. Let's make VIm a heaven for writers. Best ways to suppor...
Git Better Than 95% of People
Просмотров 17 тыс.3 месяца назад
Lazy Git is my new buddy when it comes to anything beyond pull/push/commit. I combined it with Tmux for extra sweetness, and in this video I cover the main features, motions, and the why & how I use it. ▶ github.com/jesseduffield/lazygit ▶ github.com/omerxx/dotfiles Best ways to support this channel: 🎓 My course: learn.omerxx.com/courses/second-brain-neovim 📰 Become a better engineer in just 3 ...
I Tried Every AI Coding Assistant for Neovim
Просмотров 22 тыс.4 месяца назад
AI tooling is everywhere, but I want it close to home, available "at my finger tips". Having these integrated into my coding environment has proven itself in maximizing my productivity and limiting friction when working. These are the famous tools put together head to head, with the winner at the end. THIS VIDEO IS SPONSORED BY BRIGHTDATA.COM Use this link to start with free credits to use Brig...
The Holy Grail of Neovim Note Taking
Просмотров 282 тыс.4 месяца назад
I've been exploring note taking for years, but as a Vim user who's trying to make it work for every bit of text I write, it always made sense to me that the two should be connected. With Obsidian, I feel like I finally made it happen. ⚠️ If you wish to support this channel and are interested in a deep dive into building a second brain with Neovim, I have a workshop dedicated for that here: lear...
Tmux From Scratch To BEAST MODE
Просмотров 86 тыс.5 месяцев назад
Even to the savvy user, setting Tmux isn't too hard but can often take strange turns where users end up with a bloated environment, unmanaged configuration or simple an uninviting system to use. In this video I'm walking through basic installation, then configuring Tmux to be a beast! Best ways to support this channel: 🎓 My course: learn.omerxx.com/courses/second-brain-neovim 📰 Become a better ...
FZF Will CHANGE How You Work
Просмотров 26 тыс.5 месяцев назад
FZF is useful in so many ways. It's one of my favorite tools, and it's simple yet genius. LINKS ▶ fzf preview 'bat style=numbers color=always {}' ▶ github.com/junegunn/fzf ▶ github.com/ggreer/the_silver_searcher ▶ github.com/BurntSushi/ripgrep ▶ github.com/omerxx/dotfiles CONSIDER SUPPORTING THIS CHANNEL If you feel like you want to support my work, feel free to use the links below or use my af...
Neovim Can Write Your Code
Просмотров 18 тыс.6 месяцев назад
Neovim Can Write Your Code
7 Essential Command Line Text Tools
Просмотров 11 тыс.6 месяцев назад
7 Essential Command Line Text Tools
A UX Expert Fixes My Tmux
Просмотров 63 тыс.6 месяцев назад
A UX Expert Fixes My Tmux
Your shell prompt, ON STEROIDS // Starship
Просмотров 24 тыс.7 месяцев назад
Your shell prompt, ON STEROIDS // Starship
Is Neovim the ULTIMATE note taking tool?
Просмотров 46 тыс.7 месяцев назад
Is Neovim the ULTIMATE note taking tool?
You need to see what Zellij just released!
Просмотров 18 тыс.7 месяцев назад
You need to see what Zellij just released!
These HIDDEN MOTIONS in Neovim will CHANGE how you work
Просмотров 20 тыс.8 месяцев назад
These HIDDEN MOTIONS in Neovim will CHANGE how you work
The Ultimate Database Control. Right WITHIN NEOVIM
Просмотров 48 тыс.8 месяцев назад
The Ultimate Database Control. Right WITHIN NEOVIM
Git Worktrees and Neovim: A Match Made in Coding Heaven
Просмотров 24 тыс.9 месяцев назад
Git Worktrees and Neovim: A Match Made in Coding Heaven
Lightning Fast Neovim Startup Time! // Migrating to Lazy
Просмотров 10 тыс.9 месяцев назад
Lightning Fast Neovim Startup Time! // Migrating to Lazy
The Memory Leak Solution You Wish You Knew Sooner
Просмотров 3,6 тыс.10 месяцев назад
The Memory Leak Solution You Wish You Knew Sooner
SPEED UP your Vim navigation skills!
Просмотров 33 тыс.10 месяцев назад
SPEED UP your Vim navigation skills!
DEBUG in Neovim. Like a BOSS.
Просмотров 43 тыс.11 месяцев назад
DEBUG in Neovim. Like a BOSS.
Zellij for Tmuxers
Просмотров 15 тыс.11 месяцев назад
Zellij for Tmuxers
Is Zellij the PERFECT Multiplexer? // Tmux Getting Dethroned!
Просмотров 31 тыс.11 месяцев назад
Is Zellij the PERFECT Multiplexer? // Tmux Getting Dethroned!

Комментарии

  • @OfficialSkankyRich
    @OfficialSkankyRich 13 часов назад

    i am sorry to note that the guy furthermost right at around 0:29 has no idea what this guy is drawing a picture of.

    • @devopstoolbox
      @devopstoolbox 9 часов назад

      This cracked me up 😂😂😂

  • @PabloFernandezFranco
    @PabloFernandezFranco 13 часов назад

    Great video ! Watching here from Spain. I hope your Spanish learning is going well :)

  • @Quephara
    @Quephara 17 часов назад

    Do you have a cold? It sounds like you do

    • @devopstoolbox
      @devopstoolbox 12 часов назад

      I DID! Still trying to figure whether it made my voice sexier 😆

  • @mohmaster732
    @mohmaster732 17 часов назад

    How are you getting the tenting on your moonlander so high? I'd love to try that on my ergodox ez

    • @devopstoolbox
      @devopstoolbox 12 часов назад

      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 6 часов назад

      @@mohmaster732 🙏🏽💪

  • @Ulchie
    @Ulchie 19 часов назад

    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 12 часов назад

      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

  • @brotein_mancakes
    @brotein_mancakes День назад

    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 12 часов назад

      Totally the worst name ever 😆 And yeah - I figured if I'm going to tent it lets go all the way :)

  • @typecraft_dev
    @typecraft_dev День назад

    I'm a simple guy. I see Devops Toolbox, I hit the like button

    • @devopstoolbox
      @devopstoolbox День назад

      Ahhh a comment from the one and only! 💙

  • @myusernameislongerth
    @myusernameislongerth День назад

    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?

  • @jizhang2407
    @jizhang2407 День назад

    Thanks. Let’s catch, and expose, the next hacker from Ch*na.

  • @jorge28624
    @jorge28624 День назад

    git branch otra-rama

  • @ZilverDx
    @ZilverDx День назад

    Easy to remember this git command. BTW in spanish H is mutted which means it sounds like ola ;-)

  • @BhEaN
    @BhEaN День назад

    Nice!! I didn't know this Git feature, thanks for sharing!

  • @jackz166
    @jackz166 2 дня назад

    too much distraction

  • @cdenneen
    @cdenneen 2 дня назад

    I thought you switched from LazyGit to NeoGit because of context switching back in March?

    • @devopstoolbox
      @devopstoolbox 2 дня назад

      I switched from Fugitive to Neogit! Lazygit is more of a sidekick in my workflow when I do things more complicated outside Neogit's comfort zone

  • @rajneesh9775
    @rajneesh9775 2 дня назад

    Is DapUiToggle command removed from the nvim-dap plugin? I am not seeing it after plugin install.

  • @cccccc864
    @cccccc864 3 дня назад

    p for paragraphs?

  • @developonetwork
    @developonetwork 3 дня назад

    Which software are you using for presentation

  • @mogopher1506
    @mogopher1506 4 дня назад

    What is the terminal plugin you use for the project and files browsing? Thanks in advance!

    • @devopstoolbox
      @devopstoolbox 4 дня назад

      You mean Telescope? Or something else?

    • @mogopher1506
      @mogopher1506 2 дня назад

      @@devopstoolbox yes it is, Thanks!

  • @princeofexcess
    @princeofexcess 4 дня назад

    Vim is sadly not fully supported. gf doesnt seem to be working macros are broken. I use it but i miss the neovim experience.

    • @devopstoolbox
      @devopstoolbox 4 дня назад

      Why not Neovim then? You could also always just go raw but definitely having the entire thing around makes life nicer

    • @princeofexcess
      @princeofexcess 4 дня назад

      @devopstoolbox I use neovim for coding. I like the markup experience for notes. Do you have any plug-ins you recommend?

    • @devopstoolbox
      @devopstoolbox 4 дня назад

      @@princeofexcess I’m actually working on a video covering these as we speak. Don’t have a conclusion yet but stay tuned :)

  • @paulaleksis1513
    @paulaleksis1513 4 дня назад

    Jeez you are so good at teaching thank you so much

  • @laughingvampire7555
    @laughingvampire7555 5 дней назад

    No, git trees are not filthy, what you have is a cultural bias from the west, there is an interesting video about this situation,`How culture made Japanese Internet design "Weird"` by Cynthia Zhou, *the video starts by comparing western web design vs Japanese web design* she explains what some sociologists have said about this in the past, the *West is analytical vs Eastern Asia is Holistic,* Analytical meaning we center on one thing at a time while Easters Asia focuses on the connections between multiple things, and the art and culture reflects all of this, including web design. To us, something like the git tree that reflects the multiple connections of things looks confusing just because we don't have the training for it, so is a skill's issue. Of course people in both sides have the skill of the other side, people in the west can be holistic and think better in terms of connection of things while people in east asia can follow the analytical mind focused on thing at a time. but the majority is the other way around.

    • @devopstoolbox
      @devopstoolbox 4 дня назад

      I’m sorry, while this really sounds interesting (and I’d love a link to the video) I don’t see how this changes the impact merge commits have on duplicate artifact and build times. Moreover, I don’t see how a holistic approach (?) sees merge commits differently 🤷

  • @windowsrefund
    @windowsrefund 5 дней назад

    Isn't the problem that we're talking about objects that are very language specific? I mean, go may have "functions" but other languages do not.

    • @devopstoolbox
      @devopstoolbox 5 дней назад

      The idea behind text objects is their ability to understand the language you’re working with, in part, that’s the reason behind treesitter. With that information it can map different objects even if Python and TS don’t have the same function structure.

  • @laughingvampire7555
    @laughingvampire7555 5 дней назад

    using oh-my-zsh no wonder it was slow your shell, all the shell frameworks are just heavily bloated, like bash-it or oh-my-bash, they are all bloated all you need is to copy what you really use from them and make your own configuration from scratch.

  • @urzalukaskubicek9690
    @urzalukaskubicek9690 6 дней назад

    I am just using screen lol

  • @JohnWasinger
    @JohnWasinger 7 дней назад

    What diagramming tool are you using?

  • @TreeLuvBurdpu
    @TreeLuvBurdpu 7 дней назад

    Codeium is really good

  • @codeman99-dev
    @codeman99-dev 7 дней назад

    I don't get it. What was gained here? You certainly lost github's automatic commit message referencing the source PR.

    • @devopstoolbox
      @devopstoolbox 7 дней назад

      No merge commit -> same hash that was already built tested and shipped can be deployed to production == no testing / building, 100% confidence of the hash that was built + the ability to quickly deploy other already-built versions.

  • @ZacMagee
    @ZacMagee 7 дней назад

    Great to see your channel and content grow, keep it up man. Your content has helped me grow my skills considerably

  • @Ibrahimdevelopment
    @Ibrahimdevelopment 8 дней назад

    Banger as usual

  • @Mooooov0815
    @Mooooov0815 8 дней назад

    So much useful stuff that’s all blocked in our huge monorepo. So I still have to endure 40+ minute wait times on a stupid JS project when merging a feature branch

  • @VinitKhandagle
    @VinitKhandagle 8 дней назад

    love your obsidian theme.. would you be able to share theme and settings

  • @JohnPywtorak
    @JohnPywtorak 8 дней назад

    Why not mention that the video and resource you've based all this on is not in the same language? I really was interested, but it is difficult to follow with only subtitles. Surely there was some other resource that also validates the point. Why not use that?

    • @devopstoolbox
      @devopstoolbox 8 дней назад

      I don’t have another resource unfortunately. The talk I based this on was given by a friend and I took it (with Erik’s permission) and what you see here is a translation of the idea to an English video, wrapped with additional context I thought was important. I don’t believe there’s another resource covering this one specific topic as it is a. Opinionated and b. Made by Erik However, if you do have something, please share and I’ll add it to the description.

  • @ciscoserrano
    @ciscoserrano 8 дней назад

    I love seeing your channel grow. Great video dude.

  • @josh6657
    @josh6657 8 дней назад

    You are a DevOps legend!

  • @user-qd3jm9vp4y
    @user-qd3jm9vp4y 8 дней назад

    whats you neovim font , it looks super good

  • @catwhisperer911
    @catwhisperer911 8 дней назад

    I omit the --ff-only argument when merging a feature branch by rebasing off of its parent branch (the local branch from which the current branch was checked out from). While the difference appears minor, the benefit for me at least is how it promotes frequent fetching and pulling to the parent branch first, which makes testing more productive as you are not only testing your feature but also the feature's integration into the larger system. I admit this is a subjective approach but it has paid off numerous times while working on fast changing code bases. Thanks for sharing.

    • @devopstoolbox
      @devopstoolbox 8 дней назад

      I haven’t considered that! Thank you!

  • @ZilverDx
    @ZilverDx 8 дней назад

    Cool video I need this Thank you! Q, Which Keyswitch did you choose on your moonlander keyboard? I'm about to purchase one. Are you using zellig in the video?

    • @devopstoolbox
      @devopstoolbox 8 дней назад

      I’m using Tmux here! Went with the cherry red switches but ended up switching rather quickly to the Gateron yellow as they’re pre lubed and sound way better

  • @ZeRonaldo89
    @ZeRonaldo89 8 дней назад

    What is the program you are using to draw?

  • @willernst
    @willernst 8 дней назад

    This is great stuff, but I have to admit, 1:30 in and I'm distracted by your awesome diagramming tool. What is that?

  • @xtinctspecies
    @xtinctspecies 8 дней назад

    No fzf?

    • @devopstoolbox
      @devopstoolbox 8 дней назад

      ruclips.net/video/MvLQor1Ck3M/видео.html :)