Menu
Sync current branch with base branch. Codex (you) resolves conflicts intelligently, not automated scripts.
Install with Codex or Claude Copy this prompt, paste it into Codex, Claude, or another assistant, and let it review the skill page and install it for you.
Based on SOC occupation classification
Get Neo's architectural guidance for design decisions. Trade-off analysis for choices like microservices vs monolith, sync vs async, event-driven vs request-response — with persistent memory of how similar decisions played out.
Ask Neo to help debug intermittent, complex, or hard-to-reproduce issues. Particularly useful for race conditions, memory issues, distributed-systems bugs, and cases where the symptom is not the root cause.
Ask Neo for optimization suggestions on a function, file, or hot path. Targets algorithmic improvements, redundant work, allocation/hot-loop issues — not micro-style.
Ask Neo to extract a reusable pattern from a piece of code, or to find existing patterns in the codebase that match a description. Useful for codifying conventions and finding duplicated logic.
Get Neo's code review with semantic pattern matching. Focuses on security vulnerabilities, edge cases, error handling, and performance issues across the target file or module.
Ask Neo for semantic reasoning and code suggestions over the current codebase. Use for general questions, code suggestions, or architectural guidance backed by Neo's persistent memory.
| name | source-command-sync-branch |
| description | Sync current branch with base branch. Codex (you) resolves conflicts intelligently, not automated scripts. |
Use this skill when the user asks to run the migrated source command sync-branch.
Sync the current branch with the base branch before PR review. You (Codex) will intelligently resolve any merge conflicts.
Fetch the latest changes from origin:
git fetch origin
Attempt to merge the base branch:
git merge origin/$BASE_BRANCH --no-edit
If there are conflicts, YOU (Codex) must resolve them intelligently:
git status to see conflicted filesgit addgit commit --no-editIf conflicts cannot be resolved (e.g., too complex, unclear intent):
git merge --abort
Then return synced: false with a clear explanation.
If the merge was successful (with or without conflicts):
git push origin HEAD
{
"synced": true|false,
"had_conflicts": true|false,
"summary": "Brief summary of sync result"
}
Examples:
{"synced": true, "had_conflicts": false, "summary": "Branch synced with main, no conflicts"}{"synced": true, "had_conflicts": true, "summary": "Branch synced with main, resolved conflicts in 2 files"}{"synced": false, "had_conflicts": true, "summary": "Aborted merge with main: conflicts in config.json require manual resolution"}{"synced": false, "had_conflicts": false, "summary": "Failed to fetch from origin"}