Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Paste
P1958
Problems
Active
Public
Actions
Authored by
robertkraig
on Mar 10 2016, 2:03 AM.
Edit Paste
Archive Paste
View Raw File
Subscribe
Mute Notifications
Award Token
Flag For Later
Tags
None
Referenced Files
F1166252: Problems
Mar 10 2016, 2:03 AM
2016-03-10 02:03:22 (UTC+0)
Subscribers
None
root@phabricator:/home/phabricator/phabricator# git pull
Updating 929b4cc..27ce691
error: The following untracked working tree files would be overwritten by merge:
bin/nuance
resources/sql/autopatches/20160221.almanac.1.devicen.sql
resources/sql/autopatches/20160221.almanac.2.devicei.php
resources/sql/autopatches/20160221.almanac.3.servicen.sql
resources/sql/autopatches/20160221.almanac.4.servicei.php
resources/sql/autopatches/20160221.almanac.5.networkn.sql
resources/sql/autopatches/20160221.almanac.6.networki.php
resources/sql/autopatches/20160221.almanac.7.namespacen.sql
resources/sql/autopatches/20160221.almanac.8.namespace.sql
resources/sql/autopatches/20160221.almanac.9.namespacex.sql
resources/sql/autopatches/20160222.almanac.1.properties.php
resources/sql/autopatches/20160223.almanac.1.bound.sql
resources/sql/autopatches/20160223.almanac.2.lockbind.sql
resources/sql/autopatches/20160223.almanac.3.devicelock.sql
resources/sql/autopatches/20160223.almanac.4.servicelock.sql
resources/sql/autopatches/20160223.paste.fileedges.php
resources/sql/autopatches/20160225.almanac.1.disablebinding.sql
resources/sql/autopatches/20160225.almanac.2.stype.sql
resources/sql/autopatches/20160225.almanac.3.stype.php
resources/sql/autopatches/20160227.harbormaster.1.plann.sql
resources/sql/autopatches/20160227.harbormaster.2.plani.php
resources/sql/autopatches/20160303.drydock.1.bluen.sql
resources/sql/autopatches/20160303.drydock.2.bluei.php
resources/sql/autopatches/20160303.drydock.3.edge.sql
resources/sql/autopatches/20160308.nuance.01.disabled.sql
resources/sql/autopatches/20160308.nuance.02.cursordata.sql
resources/sql/autopatches/20160308.nuance.03.sourcen.sql
resources/sql/autopatches/20160308.nuance.04.sourcei.php
resources/sql/autopatches/20160308.nuance.05.sourcename.sql
resources/sql/autopatches/20160308.nuance.06.label.sql
resources/sql/autopatches/20160308.nuance.07.itemtype.sql
resources/sql/autopatches/20160308.nuance.08.itemkey.sql
resources/sql/autopatches/20160308.nuance.09.itemcontainer.sql
resources/sql/autopatches/20160308.nuance.10.itemkeyu.sql
resources/sql/autopatches/20160308.nuance.11.requestor.sql
resources/sql/autopatches/20160308.nuance.12.queue.sql
scripts/setup/manage_nuance.php
src/applications/almanac/capability/AlmanacCreateNamespacesCapability.php
src/applications/almanac/capability/AlmanacManageClusterServicesCapability.php
src/applications/almanac/conduit/AlmanacDeviceSearchConduitAPIMethod.php
src/applications/almanac/conduit/AlmanacServiceSearchConduitAPIMethod.php
src/applications/almanac/controller/AlmanacBindingDisableController.php
src/applications/almanac/controller/AlmanacInterfaceDeleteController.php
src/applications/almanac/controller/AlmanacNamespaceController.php
src/applications/almanac/controller/AlmanacNamespaceEditController.php
src/applications/almanac/controller/AlmanacNamespaceListController.php
src/applications/almanac/controller/AlmanacNamespaceViewController.php
src/applications/almanac/editor/AlmanacBindingPropertyEditEngine.php
src/applications/almanac/editor/AlmanacDeviceEditEngine.php
src/applications/almanac/editor/AlmanacDevicePropertyEditEngine.php
src/applications/almanac/editor/AlmanacEditor.php
src/applications/almanac/editor/AlmanacNamespaceEditEngine.php
src/applications/almanac/editor/AlmanacNamespaceEditor.php
src/applications/almanac/editor/AlmanacNetworkEditEngine.php
src/applications/almanac/editor/AlmanacPropertyEditEngine.php
src/applications/almanac/editor/AlmanacServiceEditEngine.php
src/applications/almanac/editor/AlmanacServicePropertyEditEngine.php
src/applications/almanac/phid/AlmanacNamespacePHIDType.php
src/applications/almanac/query/AlmanacNamespaceQuery.php
src/applications/almanac/query/AlmanacNamespaceSearchEngine.php
src/applications/almanac/query/AlmanacNamespaceTransactionQuery.php
src/applications/almanac/storage/AlmanacDeviceNameNgrams.php
src/applications/almanac/storage/AlmanacNamespace.php
src/applications/almanac/storage/AlmanacNamespaceNameNgrams.php
src/applications/almanac/storage/AlmanacNamespaceTransaction.php
src/applications/almanac/storage/AlmanacNetw
Aborting
Event Timeline
robertkraig
created this paste.
Mar 10 2016, 2:03 AM
2016-03-10 02:03:22 (UTC+0)
Log In to Comment