Auto-merging src/applications/harbormaster/typeahead/HarbormasterBuildStatusDatasource.php
CONFLICT (add/add): Merge conflict in src/applications/harbormaster/typeahead/HarbormasterBuildStatusDatasource.php
Auto-merging src/applications/harbormaster/storage/build/HarbormasterBuild.php
CONFLICT (content): Merge conflict in src/applications/harbormaster/storage/build/HarbormasterBuild.php
Auto-merging src/applications/harbormaster/query/HarbormasterBuildSearchEngine.php
CONFLICT (add/add): Merge conflict in src/applications/harbormaster/query/HarbormasterBuildSearchEngine.php
Auto-merging src/__phutil_library_map__.php
CONFLICT (content): Merge conflict in src/__phutil_library_map__.php
Squash commit -- not updating HEAD
Automatic merge failed; fix conflicts and then commit the result.
|