agentsclimarketplace

Git workflow

Skill Amey-Thakur/AI-SKILLS/skills/git-collaboration/git-workflow

Plug-and-play skills and prompts for every AI coding agent

Install
npx -y skills add Amey-Thakur/AI-SKILLS --skill git-workflow

Assembled from the repository path, not quoted from the project. Check it against their README if it does not work.

2 things to look at

  • 19 days oldThe repository was created 19 days ago. New is not bad, but a brand new repository carrying a familiar-sounding name is the shape a typosquat arrives in, and there has been no time for anyone else to find a problem with it.
  • 4 stars4 stars. Stars are a popularity signal and not a quality one, but at this level it is likely that nobody has read this closely except its author, and you would be relying on your own review.

What its author says it does

Copied from the file, not written here

Use git safely and legibly: branches, history, merges, conflicts, and recovery. Use when managing branches, cleaning history, resolving conflicts, or undoing mistakes.

SKILL.md

2.5 KB, 533 tokens by cl100k_base, as published. Nobody here has run it

Git workflow

History is a product for future readers. Keep it truthful, navigable, and recoverable, and never make a destructive move without an exit.

Method

  1. Branch per intention. One branch, one purpose, named for it (fix-stale-cache, add-export-api). Branch from the current default branch unless told otherwise, and pull before branching so the work starts current.
  2. Commit in reviewable slices. Each commit compiles and passes tests on its own; message subjects state the change in the imperative. Mixed concerns get split before pushing, because history is read per commit.
  3. Sync deliberately. Prefer rebasing your unshared branch onto the updated base for linear history, or merge when the project convention says so; follow the house style. Never rebase or force-push commits others may have built on. When force is legitimate (your own feature branch after cleanup), use --force-with-lease so a teammate's surprise push survives.
  4. Resolve conflicts by intent, not by side. For each conflict, answer what both changes were trying to do and produce the version that honors both, which is sometimes neither hunk verbatim. Build and test after resolving; a syntactically clean merge can still be semantically wrong. Never resolve by picking a side you do not understand.
  5. Recover calmly, in this order: uncommitted mess: stash or checkout the file; wrong last commit: amend if unpushed, revert if pushed; lost work: reflog holds roughly everything from the last 90 days; wrong branch: cherry-pick the commits where they belong, then clean up. Revert beats reset on anything shared, because it preserves the record.
  6. Before any destructive command (reset --hard, clean, force-push, branch -D), name what could be lost and check it is either saved or truly disposable. The thirty seconds of checking beats the afternoon of reflog archaeology.

Rules

  • Never commit secrets; once pushed, rotate the secret, since history removal alone is not containment.
  • Do not rewrite public history without explicit agreement from everyone affected.
  • Tags for releases, branches for work, stash for interruptions; the tool fits the job.
  • When a repository has a convention (commit format, branch names, merge style), the convention wins over this document.

Keep looking

Skills are one crate of 328,083. Ordering is by how many stacks a row turns up in, so the top of any crate is what has actually been picked rather than what has the most stars.