Git Under Contention

Name: git-under-contention
Author: TAKEOFF69

Operate Git safely when multiple humans or coding agents may share a repository, checkout, index, branches, or worktrees. Use before staging, committing, pushing, merging, rebasing, creating or removing worktrees, recovering apparently lost edits, handling staged files you did not touch, or preserving unfinished agent work under parallel-session contention.

★ 5 Synced 6 hours ago View SKILL.md

At a glance

Coding Manual install Python Actively maintained

This skill is for Coding and helps you resolve git merge conflicts, manage concurrent git operations, and prevent accidental file overwrites in shared repos.

Install

git clone --depth 1 https://github.com/TAKEOFF69/codex-skills-kit
cp -r codex-skills-kit/skills/git-under-contention ~/.claude/skills/git-under-contention

Can use Not declared by the author

Good for resolve git merge conflictsmanage concurrent git operationsprevent accidental file overwrites in shared reposcoordinate multi-agent git workflowsrecover lost commits or changeshandle contested staging areas

Setup, runtime and requirements describe TAKEOFF69/codex-skills-kit, the repo this skill ships in.

git Merge Conflicts Concurrent Development Git Worktrees collaboration Version Control

Also in TAKEOFF69/codex-skills-kit

View the repo

codex-prompt Coding

Generate structured, self-contained Codex task prompts. Use when the user asks for a Codex prompt, delegation task, fix, build, audit, ops/t...

gate-engineering Legal

Design, implement, review, or repair durable quality gates such as linters, CI checks, tripwires, corpus detectors, contract suites, and sna...

retro-distill Productivity

Run a self-distillation retrospective on recent OpenAI Codex sessions (or any Agent-Skills-compatible agent). Use when the user says 'retro,...

session-close Coding

Close a coding-agent session with durable repository state, proportional verification, documentation reconciliation, and a useful handoff. U...

verify-honestly Code Review & Testing

Choose proportional verification and write evidence-bounded completion claims for coding-agent work. Use before saying work is fixed, done,...

Other Coding skills

karpathy-guidelines multica-ai/andrej-karpathy-skills

Behavioral guidelines to reduce common LLM coding mistakes. Use when writing, reviewing, or refactoring code to avoid overcomplication, make...

webapp-testing anthropics/skills

Toolkit for interacting with and testing local web applications using Playwright. Supports verifying frontend functionality, debugging UI be...

mcp-builder anthropics/skills

Guide for creating high-quality MCP (Model Context Protocol) servers that enable LLMs to interact with external services through well-design...

claude-api anthropics/skills

Reference for the Claude API / Anthropic SDK — model ids, pricing, params, streaming, tool use, MCP, agents, caching, token counting, model...

web-artifacts-builder anthropics/skills

Suite of tools for creating elaborate, multi-component claude.ai HTML artifacts using modern frontend web technologies (React, Tailwind CSS,...

request-refactor-plan mattpocock/skills

Create a detailed refactor plan with tiny commits via user interview, then file it as a GitHub issue. Use when user wants to plan a refactor...