git-pull-after-squash-merge

Name: git-pull-after-squash-merge
Author: wan-huiyan

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

0stars

Updated last month

View on GitHub ↗License: MIT

How to add

/plugin marketplace add wan-huiyan/agent-traffic-control-archive

The exact command may vary by repository. Check the README on GitHub.

For the skill author

Drop this on your repo README

Shows your skill is listed on Skillteca, generates a backlink and trackable traffic.

[![Listada na Skillteca](https://www.skillteca.com.br/api/badge/git-pull-after-squash-merge/svg)](https://www.skillteca.com.br/skills/git-pull-after-squash-merge?utm_source=badge&utm_medium=readme&utm_campaign=badge)

#git #ai

Related skills

See all in Automação →

MoneyPrinterTurbo

84.1k

利用AI大模型，一键生成高清短视频 Generate short videos with one click using AI LLM.

Automaçãoby harry0703

weather-svg-creator

55.6k

Creates an SVG weather card showing the current temperature for Dubai. Writes the SVG to orchestration-workflow/weather.svg and updates orchestration-workflow/output.md.

Automação#aiby shanraisshan

telegram-bot-builder

39.2k

Expert in building Telegram bots that solve real problems - from

Automação#github#gitby sickn33

segment-automation

39.2k

Automate Segment tasks via Rube MCP (Composio): track events, identify users, manage groups, page views, aliases, batch operations. Always search tools first for current schemas.

Automação#github#gitby sickn33

Category alert

Get new Automação skills every Monday

One short email with only the new Automação skills. 4 minutes of reading, no spam, unsubscribe with one click.

You confirm your email on the first send. No spam. Unsubscribe with one click.

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 —

[Description truncada. Veja o README completo no GitHub.]

ShareX LinkedIn

Comments · No comments

No comments yet. Be the first.