AI Skill MartBrowse skillsPromptsProgramsLearnWhat is a Skill?
 
← Back to list

git-sync (One-Pass Branch Sync)

Commits the working tree as one commit per logical change, merges in upstream, resolves conflicts hunk by hunk, and pushes — never with force.

Dev & CodingIntermediate★ 555⑂ 152AI score 8/10Last updated: Oct 29, 2026

What it does

  • Inspects state first: git status, git fetch, ahead/behind counts; stops on detached HEAD or an in-progress merge/rebase/cherry-pick.
  • Groups the diff into logical changes, one commit each, staging by explicit path — no git add -A or git add ..
  • Refuses to stage secrets (.env*, *.pem, *.key, id_rsa*, token/credential files) and stops while naming the offending file.
  • Runs a Supabase gate for anything under supabase/: every schema edit needs a properly named migration, plus migration list and db advisors checks.
  • Pulls with git pull --no-rebase, resolves conflicts hunk by hunk, and forbids -X ours/theirs or deleting one side.
  • Bans --force, --force-with-lease, and --no-verify; protected/default branches require explicit user approval before pushing.
  • Ends with a compact report: commits made, commits pulled/pushed, files left out and why, Supabase status.

Who it's for

  • Developers who want clean, consistently scoped commit history
  • Teams that have accidentally pushed .env files or keys
  • Projects using Supabase migrations
  • Collaborative repos that want force-push accidents structurally impossible

Examples

  1. Run /git-sync with mixed UI and API edits — they become two separate commits, then get pushed.
  2. Say "commit and push" while .env.local is modified — the skill halts and names the file instead of committing it.
  3. Upstream has new commits and the merge conflicts — it resolves each hunk preserving both intents, runs the repo's typecheck/lint/tests, then finishes with git commit --no-edit.

· · · Install guide · · ·

Try it now, no install

Paste this into Claude to use the skill without installing anything.

Read the instructions in this file and follow them to help me:
https://raw.githubusercontent.com/EricTechPro/super-board/HEAD/skills/git-sync/SKILL.md

What I want: (describe your task here)

If Claude can't open the link, open it yourself and paste the contents instead.

↓ If it works for you, download the ZIP below and install it. Then it runs on its own — no pasting each time.

Install in the Claude app (no terminal)
  1. Download the ZIP with the button below.
  2. In Claude, open Settings → Capabilities and turn on 'Code execution and file creation'. (one time)
  3. Go to Customize → Skills → + → 'Upload a skill' and upload the ZIP.
↓ Download ZIP
Install in Claude Code

Let Claude do it — paste this into Claude Code

Install the skill I found on AI Skill Mart.
Copy the skills/git-sync folder from the GitHub repo EricTechPro/super-board into my ~/.claude/skills/git-sync/.
When it's done, tell me in one line what this skill can do.

Install with a command instead

git clone https://github.com/EricTechPro/super-board.git /tmp/super-board && mkdir -p ~/.claude/skills && cp -r /tmp/super-board/skills/git-sync ~/.claude/skills/

⚠ This is a third-party skill. Check the source repository before installing.

  1. Open your terminal.
  2. Clone the repo: git clone https://github.com/EricTechPro/super-board.git
  3. Create the skills folder: mkdir -p ~/.claude/skills
  4. Copy the skill in: cp -r super-board/skills/git-sync ~/.claude/skills/
  5. (Recommended) Also copy the supabase, resolving-merge-conflicts, and super-board skills so the referenced steps work.
  6. Restart Claude Code, then type /git-sync or "sync my branch" to verify it loads.
  7. Try it first on a throwaway branch before using it on shared work.
View source on GitHub ↗License: MIT