'conflict' 검색 결과

Resolve an in-progress git merge or rebase conflict end to end: read the conflict state, recover each side's original intent, resolve every hunk, run the project's checks, and prepare the merge/rebase for an explicitly approved finish. Use when asked to "resolve merge conflicts", "fix this rebase", "finish the merge", or when `git status` shows conflicted (unmerged) paths. NOT for the full ship pipeline that merges the base branch first (see mk:ship); NOT for debugging a runtime bug or test failure unrelated to a conflict (see mk:investigate / mk:fix).

한국어 요약은 준비 중입니다. 원문 설명을 표시하고 있습니다.

Resolve merge and rebase conflicts with safe recovery strategies. Covers identifying conflict sources, reading conflict markers, choosing resolution strategies, and continuing or aborting operations safely. Use when a git merge, rebase, cherry-pick, or stash pop reports conflicts, when a git pull results in conflicting changes, or when you need to safely abort and restart a failed merge or rebase operation.

한국어 요약은 준비 중입니다. 원문 설명을 표시하고 있습니다.

Retrieve armed conflict records from UCDP, a conflict data source, filtered by country and date. Review where fighting occurred, the parties involved, the type of violence, and fatality estimates with lower and upper bounds.

한국어 요약은 준비 중입니다. 영어 요약을 표시하고 있습니다.

• Researching recent fighting in a specific country
• Listing conflict events within a date range
• Checking locations and parties involved in fighting

[omh] Git branch in trouble -- a merge conflict, a commit that broke something, history to repair: plan the resolution, the bisect, or the rewrite, name what is already pushed first, and force-push only with `--force-with-lease`. Use when the user says: git-workflow, git workflow, merge conflict, merge conflicts, rebase conflict, resolve the conflict, resolve this conflict, conflict markers.

한국어 요약은 준비 중입니다. 원문 설명을 표시하고 있습니다.

Conflict resolution strategies and mediation techniques for interpersonal and group communication. Covers conflict styles (Thomas-Kilmann model), interest-based negotiation (Fisher and Ury), de-escalation techniques, mediation process, restorative practices, workplace conflict, and cross-cultural conflict norms. Use when mediating disputes, analyzing conflict dynamics, preparing for difficult conversations, or building conflict-competent communication cultures.

한국어 요약은 준비 중입니다. 원문 설명을 표시하고 있습니다.

Resolve Git merge conflicts between two agents by comparing both changes and their stated goals. Combine compatible work, explain choices where designs differ, and verify the merged result with project builds or tests.

한국어 요약은 준비 중입니다. 영어 요약을 표시하고 있습니다.

• Resolving conflicts between branches edited by two agents
• Integrating changes from parallel worktrees
• Reviewing reasons for conflicting design choices

Integrate or upgrade cache-dit in SGLang diffusion, the image generation system. Follow guidance for resolving code conflicts, adding cache settings, testing feature combinations, and comparing generated images using quality measurements and logs.

한국어 요약은 준비 중입니다. 영어 요약을 표시하고 있습니다.

• Upgrading cache-dit in SGLang diffusion
• Resolving conflicts when porting upstream changes
• Adding per-request cache settings

Character creation, protagonist/antagonist design and dramatic conflict for scripts (人物/对手/冲突) — merged from Lajos Egri (three-dimensional character, orchestration, unity of opposites, pivotal character, rising vs static vs jumping conflict, transition), William Indick's Psychology for Screenwriters (Freud, Erikson, Jung archetypes, Campbell/Murdock hero journeys, Adler, Rollo May), Robert McKee (characterization vs true character, dimensions, gap, antagonism principle), Neill Hicks (character invocation, self-concept, cognitive dissonance, five conflict focuses, Maslow), Lisa Cron (desire vs misbelief), and Lu Jun (人物要活八要, 对手要强, 给对手一把刀, 最强的对手是自己, 不许请祥云). Use when building a protagonist, an antagonist or a cast, when a character feels flat or acts out of character, when conflict stalls or jumps, when a villain is too weak, when designing an arc or motive, or when diagnosing melodrama.

한국어 요약은 준비 중입니다. 원문 설명을 표시하고 있습니다.

Identifies and analyzes conflicts in software requirements including logical contradictions, technical incompatibilities, resource constraints, timeline issues, data conflicts, and stakeholder priority mismatches. Use when reviewing requirement sets, specifications, user stories, or project plans to detect conflicts that could block implementation or cause rework. Provides detailed conflict analysis with resolution strategies and impact assessment.

한국어 요약은 준비 중입니다. 원문 설명을 표시하고 있습니다.

Mechanism conflict detection and coordination for AI assistant systems. Automatically detects crontab conflicts, systemd service conflicts, script overlaps, and log path inconsistencies. Use for maintaining system harmony and preventing internal conflicts.

한국어 요약은 준비 중입니다. 원문 설명을 표시하고 있습니다.

팀에 맞는 Git 브랜치 전략을 선택하고 커밋과 풀 리퀘스트 작성 방식을 정리합니다. 이력 정리, 충돌 해결, 버전 태그와 릴리스 관리 절차도 다룹니다.

• 새 프로젝트의 브랜치 전략 선택
• 커밋 메시지와 풀 리퀘스트 설명 통일
• 풀 리퀘스트 전 로컬 이력 정리

Check a local claude-mem worker, refresh viewer-specific caches of important observations, and exclude or restore records without deleting history. Inspect rules across shared, project, and agent layers, then append conflicts to a report.

한국어 요약은 준비 중입니다. 영어 요약을 표시하고 있습니다.

• Checking worker health and refreshing important observations
• Excluding cached records while preserving source history
• Restoring previously excluded observations to a cache

Get a pull request ready by checking automated checks, merge conflicts, and local changes. Investigate failures, fix their causes, resolve conflicts, and run relevant local checks, with confirmation before pushing newly created commits.

한국어 요약은 준비 중입니다. 영어 요약을 표시하고 있습니다.

• Fixing failed automated checks on a pull request
• Resolving conflicts with the base branch
• Checking uncommitted or unpushed changes

Screen study titles, abstracts, and full texts against confirmed eligibility rules. Two AI reviewers assess records separately, with a third resolving conflicts, while outputs document exclusion reasons, selection counts, and the methods used.

한국어 요약은 준비 중입니다. 영어 요약을 표시하고 있습니다.

• Define eligibility rules from a review protocol
• Screen titles, abstracts, and full texts
• Resolve conflicting screening decisions

Explore code structure and history using an index of code relationships and meaning-based search. Trace calls, assess change impact, find likely bug locations, generate architecture reports, and review pull requests for risk and conflicts.

한국어 요약은 준비 중입니다. 영어 요약을 표시하고 있습니다.

• Tracing function calls and change impact
• Investigating code locations related to a GitHub issue
• Generating architecture reports and class diagrams

Update a working Git branch with the latest origin/main through a merge. The skill checks branch state, resolves conflicting edits with attention to both changes’ intent, runs project checks, and summarizes the resolution.

한국어 요약은 준비 중입니다. 영어 요약을 표시하고 있습니다.

• Bring the latest main changes into a feature branch
• Resolve conflicts while preserving both changes’ intent
• Sync remote feature branch updates before merging

Check game design documents against a shared registry of entities, items, formulas, and constants. Get a report of conflicting values, outdated registry entries, and references that lack enough detail to verify, with guidance on which documents need changes.

한국어 요약은 준비 중입니다. 영어 요약을 표시하고 있습니다.

• Checking consistency after adding a game design document
• Finding conflicting item prices or attributes
• Reviewing documents changed since the last review

Diagnose GKE TPU slice creation failures caused by shared nodes. Check slice status, partition labels, and monitoring data to identify conflicting resource groups, then provide resolution steps for the user to apply.

한국어 요약은 준비 중입니다. 영어 요약을 표시하고 있습니다.

• Investigating node overlap behind SliceCreationFailed
• Finding slices that share nodes across partition shapes
• Checking whether resource conflicts existed at incident time

Guides managing conflicting privacy requirements across jurisdictions. Covers data localisation vs transfer freedom, consent standards variation, age thresholds, breach timelines, and resolution frameworks for incompatible obligations. Keywords: conflicting laws, data localisation, consent variation, age thresholds, resolution framework.

한국어 요약은 준비 중입니다. 원문 설명을 표시하고 있습니다.

Use when parallel agents in a convoy or across git worktrees hit a write conflict on shared state — a git tree, a config, or a shared document — and you must decide whether the conflict is semantically real. Classifies each conflicting hunk as independent (keep both), redundant (pick one), or a genuine clash (escalate), instead of blind locks, abort-and-retry, or escalate-everything. Sits ABOVE refinery-merge and NEVER blind auto-merges: it wraps an LLM judgment, defaults to escalate on any uncertainty, and unconditionally escalates any hunk touching .planning/, config, credentials, or safety-critical paths. Backed by CoAgent (arxiv 2606.15376v1). Triggers on write conflicts between parallel agents on shared repo state.

한국어 요약은 준비 중입니다. 원문 설명을 표시하고 있습니다.

Use when a merge, rebase, cherry-pick, or stash pop stops on conflicts. Not for people-mediation conflicts: use culture-conflict-mediation.

한국어 요약은 준비 중입니다. 원문 설명을 표시하고 있습니다.

Use when the user has merge conflicts or says "resolve conflicts". Understands conflict markers, resolution strategies, and verification workflow.

한국어 요약은 준비 중입니다. 원문 설명을 표시하고 있습니다.

기존 코드에 담긴 암묵적인 명명, 구성, 오류 처리 관례를 읽어 AI가 참고할 규칙으로 정리합니다. 방침의 충돌을 하나씩 확인하고 코드 변경 후 규칙 갱신도 지원합니다.

• 오래된 코드베이스에 AI를 도입할 때
• 암묵적인 코딩 규약을 문서화할 때
• 명명과 구성 방침의 충돌을 정리할 때

Inspect Python and JavaScript dependency files for missing version constraints, duplicate entries, conflicting exact versions, and outdated Python compatibility packages. Get plain-language explanations and focused repair suggestions, with offline checks by default.

한국어 요약은 준비 중입니다. 영어 요약을 표시하고 있습니다.

• Check dependency files before investigating installation failures
• Find outdated Python compatibility packages
• Review duplicate entries and conflicting exact versions