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

0estrellas

Actualizado el mes pasado

Ver en GitHub ↗Licencia: MIT

Cómo agregar

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

El comando exacto puede variar según el repositorio. Consulta el README en GitHub.

Para el autor de la skill

Pega en el README de tu repo

Muestra que tu skill está catalogada en Skillteca, genera backlink y tráfico rastreable.

[![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

Skills relacionadas

Ver todas de Automação →

MoneyPrinterTurbo

84.1k

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

Automaçãopor 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#aipor shanraisshan

telegram-bot-builder

39.2k

Expert in building Telegram bots that solve real problems - from

Automação#github#gitpor 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#gitpor sickn33

Alerta por categoría

Recibe nuevas skills de Automação todos los lunes

Un email corto con solo las skills nuevas de Automação. 4 minutos de lectura, sin spam, te das de baja con un clic.

Confirmas tu email en el primer envío. Sin spam. Te das de baja con un clic.

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.]

CompartirX LinkedIn

Comentarios · Sin comentarios

Entra para comentar. Entrar

Aún no hay comentarios. Sé el primero.