Conflict

conflict is 2 things that don’t go together.
could be emotional conflict, could be clashing files in source control

Backlinks¶

• Supercommunicators - ThinkFastTalkSmart‬ podcast
  • Control the boundaries of a conflict to prevent it from escalating into unrelated issues.
• common source control mistakes
  • relying on auto merge.
    Do not blindly trust the result and always manually check & test the result. It often messes up.