Skip to content
Skills Library
Programming · Planning

git

/git

Apply when running git operations, merging a branch, resolving a lockfile conflict, or advising on source control workflows. Esposter's git workflow in a shared checkout, from commit messages to the queue and the lockfile.

Repository
Esposter ↗
Licence
Apache-2.0
Last repository change
26.10.2026

Assessment and security

90/ 100Class: good
Format25 / 25
Frontmatter with name and description, valid name, description up to 1,024 characters, name matching the folder.
Discoverability25 / 25
Description explains when to use the skill, has a reasonable length and uses third person.
Content25 / 35
At least 150 words and at most 500 lines, headings, step lists, examples or code.
Hygiene15 / 15
No placeholders such as TODO, no Windows paths, with a licence.
Riskno signals detected in the scan
Files in this package
5
Scripts
0
HTML comments
0
URLs in SKILL.md
0
Deprecation

No signals detected. Repository changed on 26.10.2026, without references to retired models or APIs.

Licence

Apache-2.0, otwarta: można używać i zmieniać, z zachowaniem licencji i informacji o zmianach.

What it does and when to use it

Apply when running git operations, merging a branch, resolving a lockfile conflict, or advising on source control workflows. Esposter's git workflow in a shared checkout, from commit messages to the queue and the lockfile.

Original author description

Apply when running git operations, merging a branch, resolving a lockfile conflict, or advising on source control workflows. Esposter's git workflow in a shared checkout, from commit messages to the queue and the lockfile.

How it works

  1. Commit Message Format
  2. Multi-line Commit Messages — Tool-Specific Syntax
  3. Safety Rules
  4. Pushing
  5. Branch Hygiene
  6. Merging main and the Lockfile
  7. Verify Once Per Sitting
  8. Reference pages
Original SKILL.md headings · 46 lines, 729 words
SKILL.md preview
---
name: git
description: Apply when running git operations, merging a branch, resolving a lockfile conflict, or advising on source control workflows. Esposter's git workflow in a shared checkout, from commit messages to the queue and the lockfile.
---

# Git Conventions

## Commit Message Format

Conventional-commits format and the type list are in `CONTRIBUTING.md` ("Commit Conventions").

A count in a subject or body is written as its magnitude — "a handful of proposals", never the number — for the same reason a spec does (the `openspec` skill, `references/repo-owned-facts.md`).

**Every commit ends with the `Co-Authored-By` trailer the session's attribution reminder gives**, written as the message's last line and never stripped: it is what names the model in a ledger's `Swept` cell (the `sweeps` skill, `references/ledger-files.md`).

## Multi-line Commit Messages — Tool-Specific Syntax

A heredoc piped to `-F -` from Bash, a single-quoted here-string from PowerShell — never one tool's syntax in the other — then `git log -1 --format='%B'` (`references/commit-messages.md`).

## Safety Rules

- **Never `git add -A` without reading `git status` first.** The tree can already be dirty with someone else's work — a leftover snapshot refresh, an unfinished edit — and `-A` sweeps it into your commit, where it ships under a message that does not describe it. Stage the paths you touched, or check the status and confirm every extra file belongs. If one already landed in the commit, `git reset --soft <your sha>~1` then `git restore --staged <paths>` puts it back in the working tree with its content intact.
- **Commit by pathspec when another session shares the checkout**, leave a file `git status` lists as modified until it is committed, never `--amend` (it takes the whole index), and name a commit to reset to by its sha (`references/shared-checkout.md`).
- **No command over the whole index in a shared checkout.** `git add .`, `git add -N .`, `git reset -- .` and `git restore --staged .` reach every peer's staged entry as well as your own; `git reset -- .` can drop a peer's staged files; stage by explicit path. Name your paths. The ward's whole-index guard (`packages/genshin-mods/src/services/ward/`) refuses these forms with a Bash deny while another session edits the checkout.
- **A rename that only changes case needs `git -c core.ignorecase=false` on every command that names the path** — Windows checks out with `core.ignorecase=true`, so `git add` and a pathspec `git commit` refuse the new spelling as "did not match any file", and a commit that does land leaves the old spelling behind as a staged `A` that `git -c core.ignorecase=false rm --cached` clears. `git mv` alone stages the move correctly; the pathspec commit after it is where the flag is needed.
- **Never use `git stash`** — a failed/forgotten pop loses in-progress changes. To inspect prior committed state, use `git show HEAD:path/to/file` or `git diff HEAD`. To set work aside, make a WIP commit.

## Pushing

Landing commits on **`ai/queue`** is the `review-queue` skill's loop (its pull, push and worktree).

## Branch Hygiene

**The session's checked-out branch is `ai/queue`; there are no per-chunk feature branches.** The review and the nightly release move `main`; the review brings a diverged `main` back into the queue itself (`openspec/specs/infra/review/design.md`, step 2). Otherwise `main` moves only by the owner's fast-forward of `main` to `ai/queue` after a review (`review-queue` skill). A branch's name says whose it is and the rulesets hold it to that — `ai/` the pipeline's, `renovate/` the bot's, `external/` the one prefix a collaborator may create, anything else the maintainer's (`openspec/specs/infra/branch-namespaces/design.md`). Cut a branch only when the work genuinely cannot land incrementally (a spike — in a `git worktree` rather than checked out over work in progress), and delete it after merging.

## Merging `main` and the Lockfile

Resolve `pnpm-workspace.yaml` first, keeping the higher version on every conflict — no `pnpm` runs while its markers stand — then delete `pnpm-lock.yaml` and `pnpm i`; never hand-resolve the lock, and never merge `main` into `ai/queue` by hand — the review's diverged-main step is the one merge (`references/lockfile-merges.md`).

## Verify Once Per Sitting

The touched tests run once per sitting, in the background (the `running-checks` skill, and the `package-scripts` skill's `references/check-suite.md`). Commits stay per coherent chunk, and a fix is its own commit behind the unit.

## Reference pages

- `references/commit-messages.md` — when writing a multi-line commit message from Bash or PowerShell.
- `references/shared-checkout.md` — when another session shares the checkout.
- `references/peer-hunks-in-a-worktree.md` — when a hunk of a file a peer also has dirty is committed, or a commit is built in a throwaway worktree.
- `references/lockfile-merges.md` — when a merge brings a `pnpm-workspace.yaml` or `pnpm-lock.yaml` conflict.
Files in this package (5)
  • SKILL.md 5 KB
  • references/commit-messages.md 1 KB
  • references/lockfile-merges.md 4 KB
  • references/peer-hunks-in-a-worktree.md 2 KB
  • references/shared-checkout.md 2 KB

Versions

RepositoryScoreLicence
This page · Esposter/Esposter90Apache-2.0
vanducng/skills100MIT
Navinspire-ia/navin100AGPL-3.0
maragudk/fabrik100MIT
lamngockhuong/aiteamkit100MIT
microclaw/microclaw100MIT
x-cmd/x-cmd100Apache-2.0
hyperb1iss/hyperskills100MIT
EpicenterHQ/epicenter100MIT

Database snapshot: 13.11.2026 · package version 1fabc24dd227 (SHA-256 digest of the entire package)

Downloads in the last 30 days: 0 · ranking

Report a problem with this skill: harmful content, incorrect descriptions or an author’s removal request.

Similar skills

  • 100git-workflow
    Git branching strategy, commit messages, PR workflow, conflict resolution. Use when setting up a branching strategy, writing commit messages, creating pull requests, or resolving merge conflicts.
  • 100review-queue
    Apply when about to git commit or git push, when deciding what branch a commit lands on, when a pull stops on a rebase conflict, when a review run is red, or when a CI run on ai/queue or main is red. Esposter's review queue — the agent's side of the review, the one permanent…
  • 100git-control
    Standardizes git operations, branch management, and disaster recovery. Use when committing, branching, or resolving conflicts. For commit formatting, see conventional-commits.
  • 100git-operations
    Git command patterns, branching strategy, and safety protocols. TRIGGER when: managing branches, resolving merge conflicts, or running commit/merge/push operations. SKIP: worktree lifecycle and isolation recovery (use worktree-management); CI automation (use github-actions-template).
  • 100cursor-git-integration
    Integrate Git workflows with Cursor IDE: AI commit messages, @Git context, diff review, and conflict resolution. Triggers on "cursor git", "git in cursor", "cursor version control", "cursor commit", "cursor branch", "@Git".
  • 100git-workflow
    Git workflow best practices including commit messages, branching strategies, pull requests, and collaboration patterns. Use when working with Git version control.

Feedback and reports

Your message goes to Bartosz Sokoliński. An email address is needed only for a reply. See the privacy policy.