revert war

Definition

A dispute on a wiki or in a source control repository where two users repeatedly revert one another's changes.