Lines Matching refs:Conflict
106 return "Conflict";
540 return reg_types->Conflict();
786 return *this; // Conflict MERGE * => Conflict
788 return incoming_type; // * MERGE Conflict => Conflict
790 return reg_types->Conflict(); // Unknown MERGE * => Conflict
890 return reg_types->Conflict();
907 return reg_types->Conflict(); // Unexpected types => Conflict
