Page MenuHomePhabricator

Add very basic conflict detection to Phriction
ClosedPublic

Authored by epriestley on May 17 2014, 8:39 PM.
Tags
None
Referenced Files
F13082303: D9167.diff
Wed, Apr 24, 10:05 PM
Unknown Object (File)
Fri, Apr 19, 3:36 AM
Unknown Object (File)
Fri, Apr 19, 3:36 AM
Unknown Object (File)
Fri, Apr 19, 3:36 AM
Unknown Object (File)
Thu, Apr 11, 4:48 AM
Unknown Object (File)
Wed, Apr 10, 6:48 PM
Unknown Object (File)
Wed, Apr 3, 7:03 PM
Unknown Object (File)
Tue, Apr 2, 11:54 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).