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 skills73تم التحديث 2026-03-17

50% من المنشئ

skill

المهنة

الوصف

آخر تحديث

sync-upstream-resolve-conflicts

مطوّرو البرمجيات

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

عرض 2 من أصل 2 مستودعات

تم تحميل كل المستودعات