generic-automation-and-it/smooth-ai-stockanalysis / .agents/skills/git-sync
git-sync
VerifiedSync the current working branch with origin/main and optionally resolve merge conflicts. Use when synchronizing local branch with the latest changes from main, with automatic or manual conflict resolution.
| File | Kind | Size |
|---|---|---|
| AGENTS.md | markdown | 753 B |
| SKILL.md | skill md | 4.0 KB |
| agents/openai.yaml | config | 300 B |
| scripts/safe-sync.shexecutable | script | 1.6 KB |
AGENTS.md
View on GitHub# git-sync — AGENTS.md
## TL;DR
`scripts/safe-sync.sh` does the deterministic fetch+merge and reports via sentinels; the agent only interprets them — resolution policy stays in SKILL.md, plumbing stays in the script.
## Non-Negotiables
- **`MERGE_ERROR` is not a conflict.** Dirty tree, missing ref, or failing hook (exit 2) must never be "resolved" — report and stop. Only `MERGE_CONFLICTS` (exit 1) enters resolution, and only in `--fix` mode.
- **Conflicts are intentionally left unmerged in the working tree** so either the user (default mode) or the agent (`--fix`) resolves from the same state. Don't add `--abort` cleanup to the script.
## Changelog
| Date | Change | Ref |
|:-----|:-------|:----|
| 2026-06-12 | Initial version. | |
Related skills
| Skill | Stars | Updated | Works with | Status | Install |
|---|---|---|---|---|---|
| receiving-code-reviewobra/superpowersUse when receiving code review feedback, before implementing suggestions, especially if feedback seems unclear or technically questionable - requires technical rigor and verification, not performative agreement or blind implementation | Stars: 322k | Updated | Claude CodeCodex | Verified | Install |
| requesting-code-reviewobra/superpowersUse when completing tasks, implementing major features, or before merging to verify work meets requirements | Stars: 322k | Updated | Claude CodeCodex | Verified | Install |
| using-git-worktreesobra/superpowersUse when starting feature work that needs isolation from current workspace or before executing implementation plans - ensures an isolated workspace exists via native tools or git worktree fallback | Stars: 322k | Updated | Claude CodeCodex | Verified | Install |
| verification-before-completionobra/superpowersUse 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 | Stars: 322k | Updated | Claude CodeCodex | Verified | Install |