Page MenuHomePhabricator

Add very basic conflict detection to Phriction
ClosedPublic

Authored by epriestley on May 17 2014, 8:39 PM.
Tags
None
Referenced Files
F19909660: D9167.diff
Thu, Apr 2, 1:40 AM
F19057028: D9167.diff
Nov 28 2025, 9:13 PM
F19025993: D9167.diff
Nov 24 2025, 9:21 AM
F18880463: D9167.diff
Nov 6 2025, 8:12 PM
F18846789: D9167.id21850.diff
Oct 29 2025, 9:07 PM
F18842692: D9167.id21775.diff
Oct 28 2025, 5:46 PM
F18826554: D9167.id21775.diff
Oct 24 2025, 4:32 AM
F18819868: D9167.id21850.diff
Oct 22 2025, 10:28 AM
Subscribers
Tokens
"The World Burns" token, awarded by chad.

Details

Summary

Ref T4768. This is extremely basic, but will stop conflicts from going silently unnoticed.

Test Plan

Screen_Shot_2014-05-17_at_1.37.48_PM.png (1×1 px, 150 KB)

Diff Detail

Repository
rP Phabricator
Lint
Lint Skipped
Unit
Tests Skipped

Event Timeline

epriestley retitled this revision from to Add very basic conflict detection to Phriction.
epriestley updated this object.
epriestley edited the test plan for this revision. (Show Details)
epriestley added a reviewer: btrahan.
btrahan edited edge metadata.
This revision is now accepted and ready to land.May 19 2014, 6:16 PM
epriestley updated this revision to Diff 21850.

Closed by commit rPb1ec4a9a21a3 (authored by @epriestley).