Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Drydock
Operations
Repository Operation 91
Repository Operation 91
Failed
Public
Actions
Referenced Files
None
Properties
Repository
rP Phabricator
Object
D15034: PHUIIconCircleView
Working Copy
Restricted Drydock Lease
Operation Status
Operation 91
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/36314
Error
1
Stdout
Auto-merging resources/celerity/map.php CONFLICT (content): Merge conflict in resources/celerity/map.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.