Fight about ideas, early.
The Thomas-Kilmann model describes five ways people handle conflict. None is always right. The skill is choosing on purpose.
Competing
Firm on your position.
Emergencies, or clear ethical lines.
Collaborating
Find an answer that meets both needs.
Important issues, when there's time.
Compromising
Each side gives something up.
When time is short and stakes are moderate.
Avoiding
Step back for now.
Trivial issues, or when emotions need to cool.
Accommodating
Let the other side have it.
When it matters far more to them.
Source: Kilmann Diagnostics: An Overview of the TKI Assessment Tool ↗
Choose how you handle it. Don't just react.