palarran-git-conflicts

原文涵盖的主题

• Resolve an explicit integration

Read Git contract, conflict guide, commit guide, sources, domain contracts, feature lifecycle, decision memory and global memory. Resolve target AGENTS/spec/contracts, private INDEX/ADRs, locale, stable Feature and actual merge/rebase policy; bounded memory recall is evidence only, unavailable/offline is DEFERRED. /palarran:git:conflicts {target-branch} integrates only the explicit target into the owned feature under existing authorization. --plan is offline local inspection/inert planning: no fetch, worktrees, merge/rebase, staging/commit or application checks. Do not invent a target or restart an active feature from a new default branch. 1. Inspect branch/worktree, source SHA, existing operation/owner and unrelated staged/unstaged/untracked work. Preserve it; use already authorized clean isolation rather than stash/reset/clean. Resolve/fetch only the intended remote ref when authorized, or use an explicitly requested local ref. Record target and merge-base SHAs plus actual freshness gaps. 2. Choose project-policy merge/rebase; shared/published history cannot be rewritten merely for convenience. Read unmerged stages and both commits/contracts/decisions, accounting for rebase ours/

这里只展示节选，请以完整原文和当前要求为准。