Conflict resolution
Conflict resolution is the process of addressing incompatible positions, decisions, or changes to reach an acceptable and consistent outcome.
Lead Developer Career Guide
A process for addressing disagreement and reaching an acceptable resolution among conflicting parties.
- How it is used
- Helps lead developers address team disagreements and sustain effective collaboration.
- How deep it goes
- Offers recognition cues and conversation tactics, while acknowledging that situations have no one-size-fits-all solution.
- Examples
- Uses a feature-versus-bug-fix compromise and a performance conversation that revealed a need for personal support.
- What you can do after
- Practice conflict resolution by recognizing tension, hearing all sides, managing escalation, and seeking a workable resolution.
Read how Lead Developer Career Guide explains conflict resolution →
Think Like a Software Engineering Manager
Conflict resolution, also called conflict management, is the practice of addressing and settling disagreements among people or groups.
- How it is used
- Guides engineering managers through disagreements within teams and across organizational boundaries.
- How deep it goes
- Provides a practical escalation sequence from observation through facilitated discussion, neutral mediation, and deadlock breaking.
- Examples
- Uses a disputed engineering tool choice, infrastructure costs, neutral mediation, and cross-functional team storming as concrete situations.
- What you can do after
- Apply a structured process to surface perspectives, facilitate agreement, involve neutral support, and move forward after deadlock.
Read how Think Like a Software Engineering Manager explains conflict resolution →
AI for Everyday IT
Conflict resolution is the process of addressing disagreement between parties to reach an acceptable and workable outcome.
- How it is used
- Uses AI to address workplace and technical disagreements early, neutrally, and constructively.
- How deep it goes
- Explains proactive agreements and neutral prompting, but does not detail a complete mediation procedure.
- Examples
- Uses a replication-code deadline dispute and a text-message argument converted into a conflict-resolution agreement.
- What you can do after
- Apply it via neutral AI prompting to compare positions, identify pros and cons, and establish shared rules.
ScyllaDB in Action
Conflict resolution is the process of selecting a resulting value when concurrent writes assign different values to the same data.
- How it is used
- Resolves concurrent writes in an eventually consistent ScyllaDB application.
- How deep it goes
- Explains timestamp-based convergence, replica behavior, lost writes, and prevention options without detailing their implementation.
- Examples
- Uses simultaneous author-bio edits, QUORUM and ONE writes, and CQL timestamp inspection and overrides.
- What you can do after
- Diagnose which concurrent value wins and choose conditional updates or coordination to reduce lost writes.
Related concepts
- conflictaddresses · Conflict is a state of disagreement, opposition, or incompatibility among people, positions, interests, actions, or information.
- communicationkind of · Communication is the exchange of information, meaning, or signals between people, groups, agents, devices, or software components.
- merge conflictaddresses · A merge conflict is a version-control condition in which changes to overlapping or incompatible content cannot be combined automatically.
- leadershippart of · Leadership is the practice or capability of guiding, influencing, coordinating, and making decisions for people or organizations pursuing shared objectives.
- active listeninguses · Active listening is a communication technique involving deliberate attention to, interpretation of, verification of, and responsive engagement with another person’s message.
- conflict-free replicated data typeuses · A conflict-free replicated data type is a replicated data structure whose merge rules combine concurrent updates so replicas converge without central coordination.
These guides are generated from the text of Manning books by Manning's knowledge graph and link to the sections they draw on. The full books are available on liveBook and at manning.com.