Conflict questions & answers

Conflict by ThoughtWorks is a developer-first tool that streamlines how teams identify, understand, and resolve Git merge conflicts

Ask a question about Conflict

Alternative downloads

World in Conflict
rating

Thrilling action war game for windows.

Star Conflict
Free
rating

Dynamic MMO action game for Windows users.

TS4 Package Conflict Detector
Free
rating

A powerful GUI tool for detecting and solving mod conflicts in the game.