2 Version control

12 entries

• 0033 The everyday Git workflow: status, add, commit, push, pull Git moves your changes through three places: the working folder, the staging area, and the commit history. These five commands, plus .gitignore… Beginner · Concept · Any system Article Housekeeping · Setup 15 Oct 2026
• 0034 Merging vs rebasing in Git Merge and rebase both bring commits from one branch into another. Merge keeps history exactly as it happened; rebase replays your commits… Intermediate · Concept · Any system Article Branching & rebasing 15 Oct 2026
• 0035 Undoing changes in Git: restore, reset, revert, and reflog Pick the undo command by where the mistake lives: in a file, in the staging area, in a local commit, or in… Intermediate · Concept · Any system Article Undoing changes 15 Oct 2026
• 0036 Finding the commit that broke it: log, blame, and git bisect When something used to work and now does not, Git can point at the commit that changed it. Start with log and… Advanced · How-to · Any system Article Finding bugs · Reading history 15 Oct 2026
• 0037 Git cheat sheet The Git commands you reach for most, grouped by task and using the modern switch and restore forms. Copy, paste, and replace… Beginner · Reference · Any system Article Git 15 Oct 2026
• 0038 The pull request workflow on GitHub A pull request asks to merge your branch into another one, with review and automated checks in between. This is the whole… Beginner · How-to · Any system Article Pull requests 15 Oct 2026
• 0039 A minimal GitHub Actions workflow that runs your tests Add one YAML file under .github/workflows and GitHub runs your tests on every push and pull request. Here is a small, explained… Intermediate · How-to · Any system Article GitHub Actions 15 Oct 2026
• 0040 Fix: error: failed to push some refs to … Git refused your push, usually because the remote branch has commits you do not have yet. Bring them in, combine them with… Beginner · Fix · Any system Article Common errors 15 Oct 2026
• 0041 Fix: CONFLICT (content): Merge conflict in … Two branches changed the same lines and Git cannot choose for you. Open the file, keep the right text, remove the markers,… Intermediate · Fix · Any system Article Branching & rebasing · Common errors 15 Oct 2026
• 0042 Fix: fatal: refusing to merge unrelated histories Your local repository and the remote do not share a single commit, usually because both were started separately. Allow the one-time merge,… Intermediate · Fix · Any system Article Common errors 15 Oct 2026
• 0256 Manage infrastructure as code with Terraform: from first file to plans on pull requests Learn the full Terraform workflow without a cloud account: variables, a module, outputs, state, plan, apply and destroy, a backend for shared… Beginner · Tutorial · Linux, macOS, Windows Article GitHub Actions · Terraform 15 Oct 2026
• 0262 Make your first pull request: Git and GitHub from first commit to merged change A complete beginner's path through Git and GitHub: set up Git, make commits, ignore files, use branches, push to GitHub, open a… Beginner · Tutorial · Any system Article Branching & rebasing · Pull requests · Setup 15 Oct 2026