Git safety guides

Fix the Git moments that break flow.

Evergreen, practical articles for developers who want fewer scary Git operations: lost work, destructive history edits, unreadable diffs, many-repo drift, and AI agents that propose changes a human approves.

git errorsguide

Fix “would clobber existing tag”

Compare the local and remote tag, preserve the local target, then update only the tag you verified. Avoid a blanket force fetch that rewrites every divergent tag.

Español

Cómo solucionar “would clobber existing tag” en Git

Português (Brasil)

Como corrigir “would clobber existing tag” no Git

Français

Corriger « would clobber existing tag » dans Git

Deutsch

„would clobber existing tag“ in Git beheben

Italiano

Come risolvere “would clobber existing tag” in Git

日本語

Git の「would clobber existing tag」を修正する方法

한국어

Git의 “would clobber existing tag” 오류 해결 방법

简体中文

如何修复 Git 的“would clobber existing tag”错误

العربية

كيفية إصلاح خطأ “would clobber existing tag” في Git

עברית

איך לתקן את שגיאת “would clobber existing tag” ב־Git

English

Git worktrees for AI coding agents: a safe workflow

Use Git worktrees for parallel AI coding tasks: share one known base, compare committed attempts, merge through review, and clean up without force.

Español

Git worktrees para agentes de programación con IA: flujo seguro

Usa Git worktrees para tareas de IA en paralelo: una base conocida, intentos confirmados, revisión, merge normal y limpieza sin forzar.

Português (Brasil)

Git worktrees para agentes de programação com IA: fluxo seguro

Use Git worktrees em tarefas paralelas de IA: base conhecida, tentativas commitadas, revisão, merge normal e limpeza sem forçar.

Français

Git worktrees pour les agents de code IA : méthode sûre

Utilisez les Git worktrees pour des tâches IA parallèles : même base, résultats commités, revue, fusion normale et nettoyage sans forcer.

Deutsch

Git Worktrees für KI-Coding-Agenten: ein sicherer Ablauf

Nutze Git Worktrees für parallele KI-Aufgaben: gleiche Basis, committete Ergebnisse, Review, normaler Merge und Cleanup ohne Force.

Italiano

Git worktree per agenti di coding IA: flusso sicuro

Usa i Git worktree per attività IA parallele: stessa base, risultati con commit, revisione, merge normale e pulizia senza forzature.

日本語

AIコーディングエージェント向けGit worktree:安全な運用手順

Git worktreeでAIタスクを並行化。同じ基準コミット、コミット済み成果、レビュー、通常のマージ、強制しない後片付けを徹底します。

한국어

AI 코딩 에이전트를 위한 Git worktree: 안전한 워크플로

Git worktree로 AI 작업을 병렬화하세요. 동일한 기준 커밋, 커밋된 결과, 리뷰, 일반 병합, 강제 없는 정리를 사용합니다.

简体中文

面向 AI 编程智能体的 Git worktree:安全工作流

用 Git worktree 并行处理 AI 任务:固定同一基准提交、比较已提交结果、正常评审合并,并在不强制的情况下清理。

العربية

أشجار عمل Git لوكلاء البرمجة بالذكاء الاصطناعي: سير آمن

استخدم أشجار عمل Git لمهام الذكاء الاصطناعي المتوازية: أساس واحد، نتائج ملتزم بها، مراجعة ودمج عادي وتنظيف بلا إجبار.

עברית

Git worktrees לסוכני תכנות מבוססי AI: תהליך בטוח

השתמשו ב-Git worktrees למשימות AI מקבילות: בסיס משותף, תוצאות שמורות ב-commit, סקירה, מיזוג רגיל וניקוי ללא כפייה.

recoveryguide

My AI agent deleted my code

Claude Code or Cursor wiped files or reset a branch? Preserve the repository, classify the missing work, then use reflog, path-scoped restore or fsck without overwriting other edits.

recoveryguide

How to undo git reset --hard

Your commits are almost never gone. Find where HEAD pointed before the reset with git reflog, then reset back to HEAD@{1} or branch off the SHA. Correct steps, plus what reflog cannot restore.

recoveryguide

How to recover a deleted Git branch

A branch is just a name on a commit. Find the tip SHA with git reflog or the delete message, then recreate it with git checkout -b. Includes git fsck for when the reflog is gone.

agentsguide

Git MCP server for Codex, Claude Code and Cursor

How a Git MCP server separates direct reads, direct writes and human-approved proposals. FluxGit exposes 25 read-only tools, twelve proposal tools and cancellation, with no direct Git mutation endpoint.

agentspermissions

AI coding agent permissions for Git

Compare read-only, propose-with-approval and direct-execute access. Includes a permission matrix, threat model, copyable policy and the limits of shell controls, restore points and audit signing.

agentssetup

Wire any MCP client to Git, safely

Ten minutes from install to your first approval-gated write. The 25 read-only tools span local Git, documented fallbacks and FluxGit-powered safety context; twelve tools submit proposals and operation.cancel withdraws one.

safetyguide

What is a safety-first Git client?

How guarded operations, explicit risk previews, restore points, and recovery paths make reset, rebase, and checkout less dangerous while discard stays explicit when no restore point will be created.

recoveryguide

How to recover lost Git work with reflog

A calm recovery workflow for hard resets, deleted branches, rebases, and commits that seem to have disappeared.

diffguide

Semantic diff vs normal Git diff

When structural diffs help, when plain patches are still the source of truth, and why honest fallback matters.

multi-repoguide

How to manage many Git repositories

Local-first strategies for dirty worktrees, behind branches, divergent repos, submodules, and attention stacks.

agentsgovernance

AI agents and Git, without handing over the keys

Why FluxGit MCP exposes no direct Git mutation endpoint: a human reviews proposals with operation-specific impact and available recovery context, while the audit chain records the outcome.

agentscontext

Your agent's context window is the new CPU

repo.brief returns the core repository orientation fields in one typed call, and a CI regression test enforces its payload-size budget.

researchdataset

Git MCP token benchmark: repo.brief vs CLI

One typed call used 362 output tokens versus 1,790 for a broad ten-command CLI sweep, and fewer than a minimal 492-token five-command set. Includes method, counterexamples, checksums and downloadable artifacts.

monoreposagents

Submodules are where agents go to die

Thirty vendored dependencies means hundreds of CLI commands before the first edit. repo.scope and repo.brief collapse that into two calls.

product

How FluxGit approaches these workflows

FluxGit is in public beta for macOS, Windows and Linux, with safety rails, reflog recovery, semantic diff fallback, Fleet Radar, and MCP for agents: 25 read-only tools, twelve human-approved Git proposal tools and operation.cancel for an agent's own pending proposal.

mobileprivate preview

Your repositories and coding terminal, from your phone

See what has been verified on Android and iPad, how a real Codex terminal session works from a phone, and which capabilities still remain on the desktop.

Public beta

Try safer Git workflows in FluxGit.

FluxGit is a desktop Git client in public beta for macOS, Windows and Linux. It does not send repository data by default; diagnostics and feedback are explicit, and agents never get direct write access: they propose, you approve.

Download FluxGit

Git School

Guides in your language