Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Drydock
Operations
Repository Operation 68
Repository Operation 68
Failed
Public
Actions
Referenced Files
None
Properties
Repository
rARC Arcanist
Object
D14486: Remove "async" mode from test engines
Working Copy
Restricted Drydock Lease
Operation Status
Operation 68
Land Revision
This change did not merge cleanly. This usually indicates that the change is out of date and needs to be updated.
·
Show Details
Hide Details
Command
git merge --squash -- refs/tags/phabricator/diff/35044
Error
1
Stdout
Auto-merging src/unit/engine/ArcanistUnitTestEngine.php CONFLICT (content): Merge conflict in src/unit/engine/ArcanistUnitTestEngine.php Squash commit -- not updating HEAD Automatic merge failed; fix conflicts and then commit the result.
Stderr
Logs
View All
Blueprint
Resource
Lease
Type
Data
Date
No data available.