II.
LibraryProcess overview
Reference · livelib-process:shared--conflict-resolution
conflict-resolution overview
Resolve merge conflicts correctly: read both sides, prefer rebase, regenerate generated files, verify with full check.
Attributes
displayName
conflict-resolution
description
Resolve merge conflicts correctly: read both sides, prefer rebase, regenerate generated files, verify with full check.
libraryPath
library/processes/shared/ci/conflict-resolution.js
Outgoing edges
lib_applies_to_domain1
- domain:software-engineering·DomainSoftware Engineering
lib_covers_topic2
- topic:test-driven-development·TopicTest-Driven Development
- topic:code-review-best-practices·TopicCode Review Best Practices
lib_implements_workflow3
- workflow:code-review·Workflow
- workflow:feature-development·Workflow
- workflow:release-management·Workflow
lib_involves_role3
- role:backend-engineer·RoleBackend Engineer
- role:tech-lead·RoleTech Lead
- role:qa-engineer·RoleQA Engineer
lib_requires_skill_area2
- skill-area:code-review-practice·SkillAreaCode Review Practice
- skill-area:e2e-testing·SkillAreaEnd-to-End Testing
Incoming edges
None.