Photo by Lukas Blazek on Pexels
We’ve all been there: it’s 4:45 PM on a Friday, your code is a chaotic tangle of half-baked ideas, you need to switch branches immediately, and running git status looks like a crime scene. Before you panic-delete your repository and consider a career in goat farming, let’s look at how a few straightforward Git tricks can save your sanity, your codebase, and your weekend.
Welcome to the Old Lane 17 guide on Git efficiency. No over-engineered enterprise CI/CD pipelines here—just pure, unadulterated command-line survival skills for developers who just want to ship code and go home.
1. Git Stash: The Digital Sweeping-Under-The-Rug Button
Picture this: You are halfway through refactoring a messy Python script when your tech lead drops a high-priority bug fix in your lap. You can’t commit your current work because it’s broken, and you can’t switch branches because Git is holding your files hostage.
Enter git stash. It’s essentially a clipboard for your entire working directory.
bash# Save your current dirty state with a helpful message
git stash save "wip: half-baked python refactor"
# Do your emergency bug fix, commit, and push
# Bring your chaos back when you're ready
git stash pop
Pro-tip: If you have multiple stashes lying around like unread emails, view them with git stash list and apply a specific one using git stash apply stash@{2}.
2. Interactive Rebase: Rewriting History (Legally)
Clean commit messages are a love letter to the developer who has to debug your code six months from now (which, let’s be honest, is usually you). If your commit history looks like a sequence of desperation (git commit -m "fix typo", git commit -m "pls work", git commit -m "fixed it for real this time"), interactive rebase is your best friend.
To squash your last 3 commits into a single, professional commit, run:
bashgit rebase -i HEAD~3
Your text editor will open with a list of your commits. Change the word pick to s (or squash) for the commits you want to merge into the one above them:
textpick a1b2c3d Initial feature attempt
s e4f5g6h fix typo
s 7890abc fixed it for real this time
Save and close the editor. Git will then prompt you to write a single, clean commit message. Crisis averted, history polished.
3. Surviving Merge Conflicts Without Crying
Merge conflicts are the boogeyman of software development. They smell your fear. But they are just Git’s way of saying, “Hey, humans edited the exact same line, and I refuse to play favorite child.”
When a conflict hits, don’t close your laptop. Open the file and look for the markers:
python<<<<<<< HEAD
print("Hello from the main branch!")
=======
print("Hello from the feature branch!")
>>>>>>> feature-branch
Decide which code stays, delete the conflict markers (<<<<<<<, =======, >>>>>>>), and finish the job:
bash# Stage the resolved file
git add spoiled_file.py
# Continue the rebase or commit the merge
git commit -m "fix: resolve merge conflict in greetings"
4. Cherry-Picking: Stealing Your Own Good Ideas
Ever write a brilliant piece of logic on a feature branch that got abandoned, but you desperately need that one commit on main? Don’t rewrite it. Cherry-pick it.
First, find the commit hash using git log, then pull it right into your current branch:
bashgit cherry-pick a1b2c3d
It’s like copy-pasting code, but with full historical provenance.
Mastering Git isn’t about memorizing every obscure flag in the man pages. It’s about building a clean, calm terminal workflow that keeps you out of trouble. Now close this tab, go fix your commit history, and have a great weekend.
Published by the Old Lane Developer Desk.
Disclaimer: This article was generated and formatted with the assistance of Artificial Intelligence.
