تشغيل أي مهارة في Manus بنقرة واحدة

oak-complex-merge

النجوم٧

التفرعات٣

آخر تحديث٢٢ مايو ٢٠٢٦ في ١٥:٥٦

Structured workflow for merging significantly diverged branches. Use when either branch has changed 100+ files, a dry-run merge produces 10+ conflicts, or the other branch refactored core interfaces your branch consumes.

التثبيت

التثبيت باستخدام Codex أو Claude انسخ هذا Prompt والصقه في Codex أو Claude أو مساعد آخر ليراجع صفحة Skill ويثبّتها لك.

تشغيل في Manus

المصدر

oaknational

oaknational/oak-open-curriculum-ecosystem

فتح مستودع GitHub عرض مستودعات المنشئ

تنزيل

تشغيل في Manus

المهن ذات الصلةSOC

استنادا إلى تصنيف SOC المهني

مطوّرو البرمجياتمهن الحاسوب والرياضيات·SOC 15-1252

SKILL.md

readonly

name	oak-complex-merge
description	Structured workflow for merging significantly diverged branches. Use when either branch has changed 100+ files, a dry-run merge produces 10+ conflicts, or the other branch refactored core interfaces your branch consumes.

Complex Merge (Cross-tool)

Read and follow .agent/skills/complex-merge/SKILL-CANONICAL.md.

المزيد من هذا المستودع

نفس المستودع

oak-reason

oaknational/oak-open-curriculum-ecosystem

Structured outward reasoning for analysis, planning, decisions, diagnosis, and design — a direct-trial-first gate, a decision-relevant value-of-information stop gate, and five firing moves (name the kind, frame the problem not the solution, surface the warrant, decide for reversibility, stress-test) that point to the full grammar of thinking for depth. The outward pair to oak-metacognition's inward reflection. Use when facing a gnarly problem, choice, or analysis; especially when investigation or options keep proliferating and you must decide whether to build and observe, keep analysing, stop, or escalate.

2026-07-167

oak-reason

oaknational/oak-open-curriculum-ecosystem

2026-07-167

oak-concept-exploration

oaknational/oak-open-curriculum-ecosystem

Explore an unshaped concept, phenomenon, recurring incident class, or messy set of observations before solution options or the decision question are well formed. Use when framing options immediately would foreclose the real question; run four alternating metacognition and reason movements to produce a well-formed understanding with warranted, falsifiable proposals. Do not use it as a separate pre-decision pass once the options or decision question are already well formed; continue through the estate's formed-decision workflow instead.

2026-07-137

oak-concept-exploration

oaknational/oak-open-curriculum-ecosystem

2026-07-137

oak-inter-practice-collaboration

oaknational/oak-open-curriculum-ecosystem

Join a foreign Practice estate and exchange safely with zero prior knowledge of it — the runnable join ceremony for cross-estate work. Fires whenever a session's worktree repo and coordination home are different repos, or the session is about to write into, register presence in, or claim work in any sibling Practice estate's substrate; read-only estate looks are unceremonied, and a solo write into a QUIET sibling estate takes the lighter governance-only path. Enacts the inter-Practice collaboration protocol PDR.

2026-07-137

oak-inter-practice-collaboration

oaknational/oak-open-curriculum-ecosystem

2026-07-137