git-pull-after-squash-merge

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

Automação

Autor: 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

0estrelas

Atualizado há 5 meses

Ver no GitHub ↗ Licença: MIT

Como adicionar

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

O comando exato pode variar conforme o repositório. Confira o README no GitHub.

Para o autor da skill

Cole no README do seu repo

Mostra que sua skill está catalogada na Skillteca, gera backlink e tráfego rastreável.

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

#ai #git

Skills relacionadas

Ver todas de Automação →

MoneyPrinterTurbo

90.3k

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

Automação por harry0703

weather-svg-creator

58.4k

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 #ai por shanraisshan

asana-automation

41.2k

Automate Asana tasks via Rube MCP (Composio): tasks, projects, sections, teams, workspaces. Always search tools first for current schemas.

Automação #git #github por sickn33

payment-integration

41.2k

Integrate Stripe, PayPal, and payment processors. Handles checkout flows, subscriptions, webhooks, and PCI compliance. Use PROACTIVELY when implementing payments, billing, or subscription features.

Automação #git #github por sickn33

Alerta por categoria

Receba novas skills de Automação toda segunda

1 email curto, só com as skills novas de Automação. 4 minutos de leitura, sem spam, cancela com 1 clique.

Você confirma o email no primeiro envio. Sem spam. Cancela com 1 clique.

Ler descrição completa

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

Compartilhar X LinkedIn