無料GitHub で公開

git-sync

Sync the current branch in one pass — commit the working tree as one commit per logical change (in the host repo's commit format, or the super-board writing standard), gate Supabase schema changes, merge-pull, resolve conflicts hunk by hunk, then push without force. Use when the user runs /git-sync or says "git-sync", "sync", "commit and push", "pull and push", or "sync my branch".

日本語の概要は準備中です。原文の説明を表示しています。

EricTechPro/super-board

連携ツールSupabase

インストール方法を見る

含まれるファイル（2）

SKILL.md4.7 KB
README.md1.3 KB

SKILL.md（原文）

インストールする前に、エージェントに与えられる指示の中身を確認できます。

/git-sync

Commit what is in the working tree, pull, push, report. One step per line. Stop and tell the user when a step says stop. NEVER force push, rebase shared history, or skip a hook (--no-verify).

1 · Look

Run git status, git branch --show-current and git rev-parse --abbrev-ref @{upstream}.
Run git fetch and git rev-list --left-right --count HEAD...@{upstream} for ahead/behind.
Stop on a detached HEAD.
Stop when a merge, rebase, cherry-pick or revert is in progress that this run did not start (.git/MERGE_HEAD, .git/rebase-merge, .git/rebase-apply, .git/CHERRY_PICK_HEAD).
Nothing to commit and nothing ahead or behind: say "in sync" and stop.

2 · Commit

Read the diff (git diff, git diff --staged, untracked files) and group it into logical changes. One change, one commit.
Stage each group by explicit path (git add -- <path>…). NEVER git add -A, git add . or git commit -a.
NEVER stage secrets: .env* (except .env.example), keys (*.pem, *.key, id_rsa*), credential or token files, or a diff line that holds a key. Stop and warn, naming the file.
A file that looks like someone else's work in progress (another task's half-edit, a file you can't explain from this conversation): leave it unstaged and list it in the report.
Changes already staged by the user are one group; commit them as they are.
Run the Supabase gate (section 3) before any commit that touches supabase/.
Commit each group. Let the hooks run; a failing hook is a stop, not a retry with --no-verify.

Commit format. The host wins.

The host's AGENTS.md, CLAUDE.md or CONTRIBUTING.md defines a commit format: follow it (for example #N: type: description).
Otherwise use section "1 · Commit" of the super-board writing standard (.claude/skills/super-board/references/writing-standard.md): emoji, [type], scope, subject, 1–4 bullets, Closes #N when the commit finishes a ticket.
Keep any attribution trailer the session asks for.

3 · Supabase gate

Runs only when a commit group touches supabase/ (migrations, schema, functions).

The supabase skill is installed: follow its "Making and Committing Schema Changes" section and skip the rest of this list.
Each schema change has its own migration file named the way supabase migration new <name> names it (supabase/migrations/<timestamp>_<name>.sql). A schema edit with no migration is a stop.
When the CLI and local stack are up, run supabase migration list --local.
Run supabase db advisors (or the Supabase MCP get_advisors) when available.
An advisor error is a stop. Warnings go in the report.
CLI or stack not available: say which checks were skipped and why, then continue.

4 · Pull

Run git pull --no-rebase. Merge, never rebase.
No conflict: go to Push.
Conflict: use the resolving-merge-conflicts skill when it is installed.
Without it, resolve hunk by hunk and keep both sides' intent.
NEVER use -X ours, -X theirs, git checkout --ours/--theirs on a whole file, or delete a side to make the conflict go away.
A hunk whose intent is unclear: stop and ask the user, showing both sides.
Run the host's fast checks before concluding the merge: typecheck, lint and tests as the host's AGENTS.md, CLAUDE.md or package.json documents them.
Checks fail: fix the merge, not the checks. Still failing: stop and report.
Conclude with git commit --no-edit.

5 · Push

The branch has an upstream: git push.
A new branch: git push -u origin <branch>.
NEVER --force or --force-with-lease.
The branch is the default or a protected branch (main, master, production, or the repo's default from gh repo view --json defaultBranchRef): push only after the user says yes in this conversation. Otherwise offer a branch and a PR instead.
Push rejected as non-fast-forward: go back to Pull once. Rejected again: stop.

6 · Report

Keep it short:

Committed  <sha> <subject>
           <sha> <subject>
Pulled     <N> commits (<conflicts resolved: N files | no conflicts>)
Pushed     <N> commits to <remote>/<branch>
Left out   <path> — <why>
Supabase   <advisors clean | N warnings | skipped: why>

Drop the lines that do not apply.

レビュー

まだレビューはありません。使ってみた感想をお寄せください。

ログインなしで書き込めます。使ってみた感想、質問、動かなかった環境などを気軽にどうぞ。

まだコメントはありません。最初のコメントを書いてみませんか。

同じリポジトリのスキル

super-board

無料

GitHub-Project-driven autonomous pipeline. Five verbs — onboard, lint, status, run, stop — that take a Project board from empty to drained across Build → QA → Review → Done lanes (labels qa · bug · feature route each card), with graceful shutdown / resume. Use when the user says "super-board", "/super-board", "drain my GitHub project", "set up the autonomous loop", "kick off the headless build/QA pipeline", or "stop super-board".

日本語の概要は準備中です。原文の説明を表示しています。