Synchronize local Git branches with upstream and resolve merge conflicts.
npx skills add https://github.com/zcawood-mie/agentz --skill git-sync-zcawood-mie
Please help me install this Agent Skill. Skill: git-sync Source: https://github.com/zcawood-mie/agentz/tree/main/skills/git-sync Command: npx skills add https://github.com/zcawood-mie/agentz --skill git-sync-zcawood-mie
Synchronizes local branches with upstream and resolves merge conflicts.
Use git pull --rebase origin main to update your feature branch.
High-intent search queries and answers about installing and using this skill.
To sync a local feature branch with upstream and resolve merge conflicts, use a non-interactive strategy like git pull --rebase. This updates your branch and remediates conflicts while maintaining a clean history.
The best way to update a feature branch fallen behind main is pulling with rebase to bring it up-to-date with minimal disruption. Merge when necessary, while avoiding interactive rebase workflows.
TypeScript compilation can fail after a Git rebase if merge conflicts are not fully remediated. Post-sync verification checks for leftover conflict markers and ensures the codebase builds properly.
No, you should not use an interactive rebase to sync branches. The workflow enforces a non-interactive sync strategy using git pull --rebase or merge to automate conflict remediation and validation.
Post-sync validation steps to ensure no merge conflict markers remain involve checking the codebase for leftover markers, verifying TypeScript compilation passes, and running tests to validate the sync.
dtsongPull remote Git changes into a local branch with configurable merge or rebase strategies.
omeraltnValidate RESTful API functionality, security, and performance in CI/CD pipelines.
flosrnAutomate Git commits and pushes with conventional commit messages.
cowwocCreate timestamped backup branches and validate git rebase operations.
