Syncs code from upstream repository (syhien/grokzhuce), resolves merge conflicts; on functional conflicts asks the user which parts to keep (ours/theirs/specific). Optionally adds upstream as a git remote. Use when the user asks to sync upstream, pull from upstream, merge upstream, resolve upstream conflicts, or update from syhien/grokzhuce.

2026-03-17

#002

grok2api

1 skills73updated 2026-03-17

50% of creator

skill

occupation

description

updated

sync-upstream-resolve-conflicts

software-developers

Syncs code from upstream repository (chenyme/grok2api), resolves merge conflicts; on functional conflicts asks the user which parts to keep (ours/theirs/specific). Optionally adds upstream as a git remote. Use when the user asks to sync upstream, pull from upstream, merge upstream, resolve upstream conflicts, or update from chenyme/grok2api.

2026-03-17

Showing 2 of 2 repositories

All repositories loaded