Hi friends, You know how companies use merge commits when working on projects? Just go to one of your work projects and checkout the history of the main branch. It may look tidy (or not) but it’s bad for the environment (the real-world one 😉) While that’s pretty standard, it actually makes things messy. Every time we do this, it stops us from keeping our commit history nice and clean all the way through from development to production. Here’s why that’s a bit of a problem: if we’ve already built and tested a commit, installing dependencies in the process and storing all its details, there’s really no need to go through all that again. It’s like doing the same work twice, which wastes time and resources, which translate to environmental effects that compound and another financial waste if that’s not enough. Plus, a cleaner git history makes it easier for us to figure out issues. It helps us use tools like So, what’s the solution? We start using something called interactive rebase on our feature branches. It’s really just a way to clean up our commit history before we merge it into the main branch. This might change the history, but since it’s just on our own feature branches, it doesn’t mess up anything for everyone else. Here’s a quick guide on how to do it:
By making this part of what we do every day, our git trees will stay clean and easy to work with. Hope you find this helpful! Always happy to hear your thoughts or answer any questions. Enjoy your weekend! |
Every once in a while I send hand picked things I've learned. Kind of like your filter to the tech internet. No spam, I promise!
Thank you to our sponsors who keep this newsletter free to the reader: Aikido is your no-nonsense DevSecOps platform. One central system that shows you what matters and how to fix it, from code to cloud. So you can get back to building. Try Aikido today! We’ve all been there – that heart-stopping moment when you realize you’ve accidentally exposed sensitive information. Today, I’m sharing a personal story and introducing a tool that could save you from a similar nightmare. The Nightmare...
Hi friends! Today we’re diving deep into improving your terminal history management. Exploring techniques that can transform your command line experience from frustrating to fluid. Whether you’re a CLI novice or a terminal titan, these methods will boost your productivity and smoothen your workflow. To do that, we’ll explore three levels of terminal command management, from basic to advanced. Not actually running on my phone 😅 1. Basic: Built-in (mostly unused) tooling: Even without...
Hi friends, Tmux is a fantastic tool for managing terminal sessions, but it has its limitations. One major drawback is the lack of a floating pane feature, which can make navigating between different panes cumbersome and inefficient. Me frustrated with Tmux lack of floating panes while Zellij is killing it... Most users workaround this by creating new Tmux windows or panes, or by using hidden splits to zoom in and out. These methods work but can be inefficient and require many keystrokes,...