resolving conflicts

The word 'resolving conflicts' has 2 different meanings.

Choose one to see details.

resolve conflicts

To settle arguments

To resolve conflicts peacefully

verb

To fix code issues

To resolve conflicts in code

verb