Paths

Table of Contentst

Modernize `ArcanistMergeConflictLinter`.
ClosedPublic
Actions

Authored by joshuaspence on May 10 2014, 7:41 AM.

Tags

None

Referenced Files

	F19524522: D9039.diff
	Jan 18 2026, 1:39 AM

	F19031825: D9039.id.diff
	Nov 25 2025, 2:52 AM

	F18970226: D9039.id21464.diff
	Nov 15 2025, 7:58 AM

	F18816166: D9039.diff
	Oct 21 2025, 5:15 AM

	F18257411: D9039.id21471.diff
	Aug 22 2025, 1:44 AM

	F18228930: D9039.id21464.diff
	Aug 20 2025, 9:16 AM

	Unknown Object (File)
	May 10 2025, 11:46 PM

	Unknown Object (File)
	May 10 2025, 11:38 PM

View All Files

Subscribers

epriestley

Korvin

Details

Reviewers

epriestley

Group Reviewers

Blessed Reviewers

Commits

rARCedd85a0e9db4: Modernize `ArcanistMergeConflictLinter`.

Summary

The only real change here is adding a getLinterConfigurationName method so that this linter can be used with an .arclint file. Everything else is just some minor tidying.

Test Plan

N/A

Diff Detail

Repository

rARC Arcanist

Lint

Lint Skipped

Unit

Tests Skipped

Event Timeline

joshuaspence updated this revision to Diff 21464.May 10 2014, 7:41 AM

joshuaspence retitled this revision from to Modernize `ArcanistMergeConflictLinter`..

joshuaspence updated this object.

joshuaspence edited the test plan for this revision. (Show Details)

joshuaspence added a reviewer: epriestley.

Herald added a reviewer: Blessed Reviewers. · View Herald TranscriptMay 10 2014, 7:41 AM

Herald added subscribers: Korvin, epriestley. · View Herald Transcript

Harbormaster completed remote builds in B342: Diff 21464.May 10 2014, 7:42 AM

epriestley accepted this revision.May 10 2014, 8:55 AM

epriestley edited edge metadata.

This revision is now accepted and ready to land.May 10 2014, 8:55 AM

Closed by commit rARCedd85a0e9db4 (authored by @joshuaspence, committed by @epriestley).

Revision Contents
Changeset List

Path

Size

src/

lint/

linter/

ArcanistMergeConflictLinter.php

18 lines

Diff 21471

View Options

src/lint/linter/ArcanistMergeConflictLinter.php

Modernize `ArcanistMergeConflictLinter`.ClosedPublicActions