error: Your local changes to the following files would be overwritten by checkout:
app/authElk.service.js
app/components/dialog/confirm-dialog/confirm-dialog.view.html
app/components/dialog/dialog.service.js
app/components/dialog/export-template-dialog/export-template-dialog.controller.js
app/components/dialog/export-template-dialog/export-template-dialog.view.html
app/components/dialog/import-template-dialog/import-template-dialog.controller.js
app/components/dialog/import-template-dialog/import-template-dialog.view.html
app/components/directive/additional-options/additional-options.controller.js
app/components/directive/additional-options/additional-options.view.html
app/components/directive/condition-actions/condition-actions.controller.js
app/components/directive/condition-actions/condition-actions.view.html
app/components/directive/conditions-settings-old/conditions-settings-old.controller.js
app/components/directive/conditions-settings-old/conditions-settings-old.view.html
app/components/directive/conditions-settings/conditions-settings.controller.js
app/components/directive/conditions-settings/conditions-settings.view.html
app/components/directive/elk/product-navigator/product-navigator.controller.js
app/components/directive/elk/product-navigator/product-navigator.view.html
app/components/directive/filter-settings/filter-settings.controller.js
app/components/directive/filter-settings/filter-settings.view.html
app/components/directive/input-clearable/input-clearable.controller.js
app/components/directive/input-clearable/input-clearable.view.html
app/components/directive/integration-options/integration-options.controller.js
app/components/directive/integration-options/integration-options.view.html
app/components/directive/print-conditions-settings/print-conditions-settings.controller.js
app/components/directive/print-conditions-settings/print-conditions-settings.view.html
app/components/directive/reorder-list/reorder-list.controller.js
app/components/directive/reorder-list/reorder-list.view.html
app/components/directive/screen-settings/screen-settings.controller.js
app/components/directive/screen-settings/screen-settings.view.html
app/components/directive/server-settings/server-settings.controller.js
app/components/directive/server-settings/server-settings.view.html
app/components/directive/sort-settings/sort-lines-options/sort-lines-options.controller.js
app/components/directive/sort-settings/sort-lines-options/sort-lines-options.view.html
app/components/directive/sort-settings/sort-options/sort-options.controller.js
app/components/directive/sort-settings/sort-options/sort-options.view.html
app/components/directive/sort-settings/sort-settings.controller.js
app/components/directive/sort-settings/sort-settings.view.html
app/components/directive/state-lines-settings/state-lines-settings.controller.js
app/components/directive/state-lines-settings/state-lines-settings.view.html
app/components/directive/style-settings/preview-css/preview-css.controller.js
app/components/directive/style-settings/preview-css/preview-css.view.html
app/components/directive/style-settings/style-settings.controller.js
app/components/directive/style-settings/style-settings.view.html
app/components/directive/timer-settings/timer-settings.controller.js
app/components/directive/timer-settings/timer-settings.view.html
app/components/elk/elk.controller.js
app/components/elk/elk.route.js
app/components/protocol/protocol.detail.controller.js
app/components/protocol/protocol.detail.view.html
app/components/servers/server-service.controller.js
app/components/servers/server-service.view.html
app/components/templates/templates.controller.js
app/components/templates/templates.route.js
app/components/templates/templates.view.html
public/callback.html
public/logout.html
public/silent.html
Please, commit your changes or stash them before you can switch branches.
Aborting (1) |
|