pht('Unresolved merge conflict'), ); } public function lintPath($path) { $lines = phutil_split_lines($this->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, 1, self::LINT_MERGECONFLICT, pht('This syntax indicates there is an unresolved merge conflict.')); } } } }