public static function hasConflict($dir)
{
$output = SvnPeer::getStatus($dir);
foreach ($output as $line) {
if ('C' == substr(trim($line), 0, 1) || '!' == substr(trim($line), 0, 1)) {
return true;
}
}
return false;
}
