How to Squash Multiple Commits into One with Git Rebase Interactive (Short Guide)
Committed five times while fixing one bug and want a single clean commit before pushing? Here is the exact git rebase -i workflow to squash them into one. Step 1: Check How Many Commits You Need to Squash git log --oneline Count the commits that belong to the same piece of work. In this example we’re squashing the last 4.
How to Resolve Git Rebase Conflicts and Continue (Short Guide)
Git rebase stopping with a conflict is not an error — it’s Git pausing for you to fix it. Here is the exact workflow to resolve the conflict and continue, or safely back out. Step 1: Start the Rebase git rebase main If a commit has conflicting changes, Git stops and shows CONFLICT in the terminal, naming the file involved.
How to Resolve Git Merge Conflicts (Short Guide)
Git stopped your merge and flagged a conflict — here is the exact three-step fix to resolve it and get back to work. Step 1: See Which Files Have Conflicts git status Files listed under both modified are the ones you need to fix. Every other file merged cleanly without your help.
How to Save Unfinished Work and Switch Branches in Git (git stash)
You are halfway through a feature and your teammate just pinged you about a critical bug on main — here is how to shelve your unfinished work instantly and switch branches without losing a single line. Prerequisites Git installed and a repository initialised At least one other branch to switch to (e.g. main) Step 1: Stash Your Unfinished Changes git stash Git saves all tracked, modified files to a temporary stack and reverts your working directory to the last clean commit. You will see output like:
How to Sign Git Commits with GPG on Linux (Step-by-Step)
Want the green Verified badge on your GitHub commits? This guide shows you how to link your GPG key to Git and sign every commit automatically — no bloat, just the commands. Step 1: Find Your GPG Key ID gpg --list-secret-keys --keyid-format=LONG Example output:
How to Export GPG Keys on Linux (Step-by-Step)
When migrating to a new machine or backing up your digital identity, you need to export your GPG keys. Here is the quickest way to export both public and private GPG keys via the Linux terminal. TL;DR / Quick Command Summary: Export the public key: gpg --armor --export YOUR_KEY_ID > public_key.asc Export the private key: gpg --armor --export-secret-keys YOUR_KEY_ID > private_key.asc Export the ownerturst values: gpg --export-ownertrust > ownertrust.txt Step 1: List Your GPG Keys First, find the key id or the email address associated with the key you want to export: