getData($path), false); foreach ($lines as $lineno => $line) { // An unresolved merge conflict will contain a series of seven // '<', '=', or '>'. if (preg_match('/^(>{7}|<{7}|={7})$/', $line)) { $this->raiseLintAtLine( $lineno + 1, 0, self::LINT_MERGECONFLICT, 'This syntax indicates there is an unresolved merge conflict.'); } } } public function getLintSeverityMap() { return array( self::LINT_MERGECONFLICT => ArcanistLintSeverity::SEVERITY_ERROR, ); } public function getLintNameMap() { return array( self::LINT_MERGECONFLICT => 'Unresolved merge conflict', ); } }