II.
LibraryProcess overview
Reference · livelib-process:collaboration--conflict-resolver
specializations/collaboration/github/conflict-resolver overview
Merge-conflict resolver. Detects conflicts, checks whether upstream already covers the PR (safe-close if so), otherwise rewrites the PR branch in place: rebase onto base, resolve each conflict category, verify locally, force-push-with-lease, re-invoke validator. Works DIRECTLY on the existing PR branch — never creates a new branch/PR.
Attributes
displayName
specializations/collaboration/github/conflict-resolver
description
Merge-conflict resolver. Detects conflicts, checks whether upstream already
covers the PR (safe-close if so), otherwise rewrites the PR branch in place: rebase onto
base, resolve each conflict category, verify locally, force-push-with-lease, re-invoke
validator. Works DIRECTLY on the existing PR branch — never creates a new branch/PR.
libraryPath
library/specializations/collaboration/github/conflict-resolver.js
specialization
collaboration
Outgoing edges
lib_applies_to_domain1
- domain:software-engineering·DomainSoftware Engineering
lib_belongs_to_specialization1
- specialization:collaboration·SpecializationCollaboration Tools & Practices
lib_covers_topic1
- topic:code-review-best-practices·TopicCode Review Best Practices
lib_implements_workflow2
- workflow:code-review·Workflow
- workflow:pull-request-lifecycle·Workflow
lib_involves_role3
- role:tech-lead·RoleTech Lead
- role:engineering-manager·RoleEngineering Manager
- role:backend-engineer·RoleBackend Engineer
lib_requires_skill_area2
- skill-area:code-review-practice·SkillAreaCode Review Practice
- skill-area:gitops·SkillArea
Incoming edges
None.