agentleFS
Sign inStart free
Effulgent-PointEffulgent-Point/paw/skills/git-safety/SKILL.md

git-safety

Skill2 starsChanged 4 months agoMITView on GitHub

When to use: Any git operation that could lose work — pull, push, merge, rebase, branch management, conflict resolution. When merge conflicts happen: For rare cases where you genuinely need the dangerous operation: Set the env var, run the command, unset. You can, but you have to mean it.

  • Deletes or force-pushes
  • Commits and pushes

We split this skill into the rules it gives an agent

4 rules. 0 are common, 4 are distinctive, and 0 are very specific to this project.

  • 0

    Common

    Most of the 8 edited versions we read keep these.

  • 4

    Distinctive

    This author's own choices. Worth a look.

  • 0

    Very specific

    Tied to their project's names, files or tools. Probably skip.

  • Common
  • Distinctive
  • Very specific
  1. Distinctive:

    Never commit on main: Create a feature branch. Always.

    line 10
  2. Distinctive:

    When merge conflicts happen:

    line 25
  3. Distinctive:

    Delete branches after merge

    line 37
  4. Distinctive:

    Keep branches short-lived — days, not weeks

    line 38

“Common” is measured: kept by at least 6 in 10 of the 8 edited versions of this file we could read. “Very specific” is our guess from the words: it names a file, a command, a setting or the project itself.

Keep what fits and drop the rest. Your version, ready for your agents.
Files
SKILL.md

Git Safety Skill

When to use: Any git operation that could lose work — pull, push, merge, rebase, branch management, conflict resolution.

Core doctrine

  1. Always pull (merge). git pull defaults to merge. Never use --rebase.
  2. Never rebase published history. Rebase rewrites commits other people have cloned. Use merge.
  3. Never force-push. --force overwrites remote history. Pull first, then push.
  4. Never commit on main. Create a feature branch. Always.

Protected operations and alternatives

DangerousSafe alternative
git rebase maingit pull origin main (merge)
git pull --rebasegit pull (merge)
git push --forcegit pull origin branch && git push
git branch -D featuregit branch -d feature (safe delete)
git reset --hard HEAD~1git revert HEAD or git stash
git checkout .git stash

Conflict resolution

When merge conflicts happen:

  1. Understand both sides' intent — don't blindly pick "ours" or "theirs"
  2. Combine compatible changes — if both sides add different things, keep both
  3. Escalate competing changes — if both sides change the same logic differently, get both authors involved
  4. Run tests before committing the merge resolution
  5. If tests fail after resolution — escalate, don't guess

Branch workflow

  • One branch per logical task
  • Branch names: feat/description, fix/description, chore/description
  • Delete branches after merge
  • Keep branches short-lived — days, not weeks

Override escape hatches

For rare cases where you genuinely need the dangerous operation:

Env varOverrides
PAW_ALLOW_REBASE=1git rebase, git pull --rebase (local unpublished only)
PAW_ALLOW_FORCE_PUSH=1git push --force (never to main)

Set the env var, run the command, unset. You can, but you have to mean it.

Download now (ZIP)

  • Other versions9 projects use a version of this.

    Word for word · 0

    None found.

    Edited · 0

    None found.

    Wrote their own version · 9

    1. tamagui/tamagui★ 14ksame name
    2. waynesutton/convexskills★ 405same name
    3. waynesutton/builder-skills★ 404same name
    4. genfeedai/genfeed.ai★ 4same name
    5. lennertvhoy/ProjectState_Template★ 1same name
    6. shaunburdick/skills★ 1same name
    7. haintbotast/coding-agent-instructions★ 0same name
    8. kartykk/agent-ready★ 0same name
    9. Tsurai7/agentic-playbook★ 0same name

    How matches are found. Word for word: the exact same text. Edited: shares passages with this file (“99% same” means 99% of its five-word phrases also appear here; 10% or more counts). Their own version: similar meaning, or, weakest, the same name. We can’t tell which project had it first. Projects are counted among the 200 most-starred candidates, and mentions are links to the repository we found, up to 50 per site, so both counts are a floor.

  • Used alongsideProjects with it also use verification-before-completion.

    Other files people use alongside this one.

    Files found in the same public projects as a version of this one, more often than they turn up anywhere else. Each project counts once, large collections count for less, and this file's own repository is left out.
    • OpenAISkill

      verification-before-completion

      Use when about to claim work is complete, fixed, or passing, before committing or creating PRs - requires running verification commands and confirming output before making any success claims; evidence before assertions always

      Also in 3 projects that use this

  • In this repository9 other files it gives its agents.

Does it work?

Reviews from people and from AI agents that ran it: what they used it for, and whether it worked.

Reviews can't be read right now.

Your trail

Files you open will collect here, so you can find them again.

Open two or more, and you can remix the rules you like from each into one list. Kept in this browser only.

Now do this for your own.

Bring your CLAUDE.md, AGENTS.md or skills. agentleFS shows which of your rules are common, which are yours and which only fit one project, and keeps one version your agents read everywhere.

Check your setup, free