git-pull-after-squash-merge SKILL.md skillA
git-pull-after-squash-merge from wan-huiyan/agent-traffic-control is an agent skill: a SKILL.md folder an AI agent loads when a task calls for it.
mdr add wan-huiyan/agent-traffic-control/git-pull-after-squash-merge@v1.1.0Pins v1.1.0 in mdr.lock. Pin the fingerprint instead.
- Audit grade
- A, 17 of 17 checks passed
- Kind
- SKILL.md skill
- Repository
- wan-huiyan/agent-traffic-control
- Path
plugins/agent-traffic-control/skills/git-pull-after-squash-merge/SKILL.md- Versions recorded
- 3
- Latest version
- v1.1.0, committed Jul 8, 2026
- First version recorded
- May 13, 2026
- Size
- 5,813 bytes
- Repository stars
- 3
- License
- MIT
Fix "untracked working tree files would be overwritten by merge" errors when pulling after a squash merge. Use when: (1) `git pull` fails listing files that should already be on main, (2) you just squash-merged a PR and can't pull on another branch, (3) files from a merged branch appear as "untracked" blocking checkout or pull. The root cause is that squash merge creates new commits — the original branch files exist on main but your local copy has them as untracked leftovers from the old branch.
Collected from public GitHub. Every version is saved exactly as it was and never changes. Install it at an exact version with the mdr tool, and every file is checked before it reaches your agent. The main file is checked against the SHA-256 fingerprint recorded here, and the others against the fingerprints GitHub keeps for its source commit. The automatic checks below grade the latest version, and the same checks always give the same file the same grade.
What the file says
# Fix git pull After Squash Merge
## Problem
After a PR is squash-merged to main, switching branches or pulling fails with:
```
error: The following untracked working tree files would be overwritten by merge:
data/results/experiment_1.json
data/results/experiment_2.json
docs/findings/analysis.html
Please move or remove them before you merge.
```
These files ARE on main (from the squash merge) but git sees them as untracked locally because squash merge creates a new commit hash — the original branch commits never appear in main's history.
## Context / Trigger Conditions
This happens when:
- A branch created new files (not just modified existing ones)
- The branch was **squash-merged** (not regular merge) to main
- You're on a different local branch that also has those files (from cherry-picks, worktree remnants, or the original branch)
- `git pull` or `git checkout main` refuses to proceed
Common scenarios:
- Working on branch B while branch A (which created new files) gets squash-merged
- Checking out main after a parallel session merged files you also have locally
- Multiple Claude Code sessions creating overlapping experiment result files
## Solution
…Read the whole file at its exact version.
How to install
mdr add wan-huiyan/agent-traffic-control/git-pull-after-squash-merge@sha256:8fc187f87d4fabebThe line at the top of this page pins the label v1.1.0, which is what most people want. This one pins the sha256 fingerprint of the contents instead, so it survives a label being moved. Either way the exact version is written to mdr.lock, and mdr install downloads and checks those contents again, so it installs them exactly or stops with an error.
[](https://markdownregistry.com/a/art_advd4avunb7hiptu)
3 badge image fetches in 30 days. What the badge shows.
Versions
The registry has recorded 3 versions of this file, between May 13, 2026 and Jul 8, 2026, about one every 28 days.
| version | committed | commit | size | audit | |
|---|---|---|---|---|---|
| v1.1.0 latest | 2026-07-08 | f1254dd | 5,813 B | A | view · diff |
| v1.1.0 | 2026-06-01 | cd33f29 | 5,782 B | A | view · diff |
| v1.0.0 | 2026-05-13 | 07472bf | 4,051 B | A | view |
Audit of the latest version
- pass: Frontmatter block present
- pass: Frontmatter declares a name
- pass: Frontmatter declares a description
- pass: Size between 200 bytes and 200 KB (5813 bytes)
- pass: No zero-width or bidi control characters
- pass: No instruction hidden inside an HTML comment
- pass: No link to an exfiltration or paste host
- pass: No credential-shaped string
- pass: No instruction to send local credentials anywhere
- pass: No text hidden with inline styles
- pass: No prompt-injection phrasing
- pass: No curl or wget piped into a shell
- pass: No recursive delete of root, home or parent
- pass: No instruction to read or print local credentials
- pass: No base64 blob over 200 characters
- pass: No link to a raw IP address
- pass: No script tag
Source
wan-huiyan/agent-traffic-control · 3 stars · license MIT · pushed 2026-09-22 · branch main
API
GET https://markdownregistry.com/api/v1/artifacts/art_advd4avunb7hiptu GET https://markdownregistry.com/api/v1/resolve?ref=wan-huiyan/agent-traffic-control/git-pull-after-squash-merge GET https://markdownregistry.com/api/v1/blob/8fc187f87d4fabebce11d3285d1188781d4bed289f267d058e83f2a186084527
Your AI assistant does the legwork. You hear about the deals worth your word. Hand yours the standing instructions at modelranch.com and it joins the network that reads files like this one.
Guides: the SKILL.md format and its required fields · what to check before you install a skill · how to pin a skill to an exact version · where to find agent skills · keeping a team on the same skills · which agent file does what.