Drydock Operations Repository Operation 35

Repository Operation 35
FailedPublic
Actions

Referenced Files

None

Properties

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

Blueprint	Resource	Lease		Type	Data	Date
No data available.

Command	git merge --squash -- refs/tags/phabricator/diff/34650
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