Differential D13094 Diff 31611 src/lint/linter/ArcanistMergeConflictLinter.php

Changeset View

Standalone View

Show All 21 Lines	final class ArcanistMergeConflictLinter extends ArcanistLinter {
}		}

public function getLinterConfigurationName() {		public function getLinterConfigurationName() {
return 'merge-conflict';		return 'merge-conflict';
}		}

public function getLintNameMap() {		public function getLintNameMap() {
return array(		return array(
self::LINT_MERGECONFLICT => pht('Unresolved merge conflict'),		self::LINT_MERGECONFLICT => pht('Unresolved Merge Conflict'),
);		);
}		}

public function lintPath($path) {		public function lintPath($path) {
$lines = phutil_split_lines($this->getData($path), false);		$lines = phutil_split_lines($this->getData($path), false);

foreach ($lines as $lineno => $line) {		foreach ($lines as $lineno => $line) {
// An unresolved merge conflict will contain a series of seven		// An unresolved merge conflict will contain a series of seven
Show All 12 Lines