Drydock Operations Repository Operation 268

Repository Operation 268
FailedPublic
Actions

Referenced Files

None

Properties

Repository: rP Phabricator
Object: D18529: Update Create Diff page for new Edit UI
Working Copy: Restricted Drydock Lease

Operation Status

Operation 268 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/44495
Error	1
Stdout	Auto-merging webroot/rsrc/css/phui/phui-box.css CONFLICT (content): Merge conflict in webroot/rsrc/css/phui/phui-box.css Auto-merging src/applications/config/controller/PhabricatorConfigVersionController.php CONFLICT (content): Merge conflict in src/applications/config/controller/PhabricatorConfigVersionController.php Auto-merging src/applications/config/controller/PhabricatorConfigModuleController.php CONFLICT (content): Merge conflict in src/applications/config/controller/PhabricatorConfigModuleController.php Auto-merging src/applications/config/controller/PhabricatorConfigListController.php CONFLICT (content): Merge conflict in src/applications/config/controller/PhabricatorConfigListController.php Auto-merging src/applications/config/controller/PhabricatorConfigIssueViewController.php CONFLICT (content): Merge conflict in src/applications/config/controller/PhabricatorConfigIssueViewController.php Auto-merging src/applications/config/controller/PhabricatorConfigIssueListController.php CONFLICT (content): Merge conflict in src/applications/config/controller/PhabricatorConfigIssueListController.php Auto-merging src/applications/config/controller/PhabricatorConfigHistoryController.php CONFLICT (content): Merge conflict in src/applications/config/controller/PhabricatorConfigHistoryController.php Auto-merging src/applications/config/controller/PhabricatorConfigGroupController.php CONFLICT (content): Merge conflict in src/applications/config/controller/PhabricatorConfigGroupController.php Auto-merging src/applications/config/controller/PhabricatorConfigEditController.php CONFLICT (content): Merge conflict in src/applications/config/controller/PhabricatorConfigEditController.php Auto-merging src/applications/config/controller/PhabricatorConfigDatabaseStatusController.php CONFLICT (content): Merge conflict in src/applications/config/controller/PhabricatorConfigDatabaseStatusController.php Auto-merging src/applications/config/controller/PhabricatorConfigDatabaseIssueController.php CONFLICT (content): Merge conflict in src/applications/config/controller/PhabricatorConfigDatabaseIssueController.php Auto-merging src/applications/config/controller/PhabricatorConfigController.php Auto-merging src/applications/config/controller/PhabricatorConfigClusterSearchController.php CONFLICT (content): Merge conflict in src/applications/config/controller/PhabricatorConfigClusterSearchController.php Auto-merging src/applications/config/controller/PhabricatorConfigClusterRepositoriesController.php CONFLICT (content): Merge conflict in src/applications/config/controller/PhabricatorConfigClusterRepositoriesController.php Auto-merging src/applications/config/controller/PhabricatorConfigClusterNotificationsController.php CONFLICT (content): Merge conflict in src/applications/config/controller/PhabricatorConfigClusterNotificationsController.php Auto-merging src/applications/config/controller/PhabricatorConfigClusterDatabasesController.php CONFLICT (content): Merge conflict in src/applications/config/controller/PhabricatorConfigClusterDatabasesController.php Auto-merging src/applications/config/controller/PhabricatorConfigCacheController.php CONFLICT (content): Merge conflict in src/applications/config/controller/PhabricatorConfigCacheController.php Auto-merging src/applications/config/controller/PhabricatorConfigApplicationController.php CONFLICT (content): Merge conflict in src/applications/config/controller/PhabricatorConfigApplicationController.php Auto-merging src/applications/config/controller/PhabricatorConfigAllController.php CONFLICT (content): Merge conflict in src/applications/config/controller/PhabricatorConfigAllController.php 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.