This is issue 2026-W38 as it would arrive: three items, a paragraph and a link each, one activity. Nothing is abridged.
Hi,
Technique — git rerere
Rebase a long branch and the same conflict comes back on every commit that touches the same
lines. git config rerere.enabled true makes Git record each resolution you make and replay it
the next time the identical conflict appears — in the working tree, unstaged, for you to inspect.
It is the right tool for long-lived branches and repeated rebases, and the wrong tool for a
conflict whose correct answer changed since you last resolved it: a replayed resolution is still
a guess until you read it. The article walks through recording one, watching it replay, and
forgetting a wrong one.
→ Git rerere: stop resolving the same merge conflict twice
Workflow — plan on the pull request, apply on merge
The Terraform change that destroys a production database looks like every other change in a
pull request diff. The workflow that prevents it puts terraform plan on the pull request, posts
the resource-count summary, keeps the full plan as a short-lived artifact for reviewers (plans
contain values you do not want in a comment), and runs apply only after merge, from a different
role, inside a protected environment. The lesson has the two workflows; the lab has you build
them against a scratch repository.
→ Terraform CI on GitHub Actions
Security — the trigger that runs a fork’s code with your secrets
pull_request_target exists so a workflow can comment on pull requests from forks. Add a
checkout of the pull request’s head to it and you have handed the fork your GITHUB_TOKEN and
every secret the workflow can read. The fix is not “be careful”: it is to never check out
untrusted code under that trigger, and to prefer pull_request — read-only token, no secrets —
for anything that builds or tests. The lesson shows the exact pattern and the audit grep.
→ Workflow security
This week’s activity (≈ 20 minutes)
rerere only matters once resolving conflicts is routine. The session takes you from “why conflicts happen” to a merge you resolved, staged, committed and verified — in the browser simulator first, then in a real repository. → Session: resolve and verify a merge conflict
— Modern Git Academy
That is the whole issue. The format does not change: no roundups, no sponsor slots, every link a free page on this site.