#git

Articles tagged with #git

How to fix package-lock.json merge conflicts (and yarn.lock, poetry.lock, go.sum) the right way
Never hand-edit a conflicted lockfile, and never click "Accept Both". Resolve the manifest, then let the package manager regenerate the lock. Here is the exact command for npm, Yarn, pnpm, Poetry, uv, Cargo, Go, Composer, Bundler and Pipenv, why each one is different, and LockSettle, a free VS Code extension that runs the right one for you.
Oct 1, 202610 min read4
Your app broke after git pull? The after-pull checklist every team forgets
A pull can quietly bring in new dependencies, new migrations, new .env keys, a changed Dockerfile or a bumped Node version, and nothing tells you. Here is the checklist I run after every pull (npm ci vs npm install, migrations, .env drift, stale containers), why post-merge hooks do not really solve it, and AfterPull, a free VS Code extension that works out the list for you.
Sep 30, 20269 min read3
Stop committing .env files, node_modules and it.only: check your staged changes before you press Commit
Most "oops" commits are a .env file, a huge dump, node_modules or a leftover it.only, not hard bugs. Why hooks and .gitignore miss them, how to clean up, and a free VS Code extension that checks the git index live.
Sep 29, 202610 min read1
I Was Tired of Guessing Which Branch Would Be a Merge Nightmare, So I Checked Git's Own Answer
A read-only scan of every branch's real merge outcome, ranked by severity, with optional AI merge-order advice. By Jay Tank · Engineering Blog
Jul 23, 20263 min read1
I stopped hand-writing commit messages, and my git log got better
Why a tiny tool that reads your staged diff beats both lazy "fix stuff" commits and pasting diffs into a chat window. By Jay Tank · Engineering Blog
Jul 17, 20264 min read3