DataLens UI Opensource/CHARTS-10604__1863/auth.dialog-change-password_

The translation is temporarily closed for contributions due to maintenance, please come back later.
The translation was automatically locked due to following alerts: Could not merge the repository.

Language	Unfinished	Unfinished words	Unfinished characters	Untranslated	Checks	Suggestions	Comments
Russian	0	0	0	0	0	0	0

English	0	0	0	0	0	0	0

Please sign in to see the alerts.

Overview

Project website	github.com/datalens-tech/datalens-ui
Project maintainers	robot-charts
Translation process	Translations can be made directly. Translation suggestions can be made. Any authenticated user can contribute. The translation uses monolingual files. The translation base language is editable.
Source code repository	`https://github.com/datalens-tech/datalens-ui`
Repository branch	CHARTS-10604
Last remote commit	Overflow and pin fix `794161161` Daria Larionova authored a month ago
Last commit in Weblate	Next redesign iteration `32e1574b8` Daria Larionova authored 2 months ago
Weblate repository	`https://weblate.gravity-ui.com/git/datalens/charts-10604-1863/auth-dialog-change-password-1863/`
File mask	`src/i18n-keysets/auth.dialog-change-password/*.json`
Monolingual base language file	`src/i18n-keysets/auth.dialog-change-password/ru.json`

3 weeks ago

String statistics

	Strings percent	Hosted strings	Words percent	Hosted words	Characters percent	Hosted characters
Total		24		78		542
Source		12		39		271
Translated	100%	24	100%	78	100%	542
Needs editing	0%	0	0%	0	0%	0
Read-only	0%	0	0%	0	0%	0
Failing checks	0%	0	0%	0	0%	0
Strings with suggestions	0%	0	0%	0	0%	0
Untranslated strings	0%	0	0%	0	0%	0

Last 12 months Previous

Activity in last 12 months


May	Jun	Jul	Aug	Sep	Oct	Nov	Dec	Jan	Feb	Mar	Apr

Quick numbers

Hosted words

Hosted strings

100%

Translated

Contributors

and previous 30 days

Trends of last 30 days

—

Hosted words

+100%

—

Hosted strings

+100%

—

Translated

+100%

—

Contributors

+100%

Search

Advanced query builder

Query examples

Review strings changed by other users	`changed:>=2025-04-05 AND NOT changed_by:anonymous`	Add
Translated strings	`state:>=translated`	Add
Strings with comments	`has:comment`	Add
Strings with any failing checks	`has:check`	Add
Strings with suggestions from others	`has:suggestion AND NOT suggestion_author:anonymous`	Add
Approved strings with suggestions	`state:approved AND has:suggestion`	Add
All untranslated strings added the past month	`added:>=2025-04-05 AND state:<=needs-editing`	Add
Translated strings in a certain language	`is:translated AND language:en`	Add

robot-charts Repository rebase failed DataLens UI Opensource CHARTS-10604__1863 auth.dialog-change-password__1863	Rebasing (1/1) Auto-merging .github/workflows/i18n-check.yml CONFLICT (add/add): Merge conflict in .github/workflows/i18n-check.yml Auto-merging api/server/charts-engine.ts CONFLICT (add/add): Merge conflict in api/server/charts-engine.ts Auto-merging src/@types/nodekit.d.ts CONFLICT (add/add): Merge conflict in src/@types/nodekit.d.ts Auto-merging src/i18n-keysets/auth.form-controls/en.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/auth.form-controls/en.json Auto-merging src/i18n-keysets/auth.form-controls/ru.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/auth.form-controls/ru.json Auto-merging src/i18n-keysets/chartkit.menu/en.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/chartkit.menu/en.json Auto-merging src/i18n-keysets/chartkit.menu/ru.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/chartkit.menu/ru.json Auto-merging src/i18n-keysets/collections/en.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/collections/en.json Auto-merging src/i18n-keysets/collections/ru.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/collections/ru.json Auto-merging src/i18n-keysets/component.chartkit-alerts.view/en.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/component.chartkit-alerts.view/en.json Auto-merging src/i18n-keysets/component.chartkit-alerts.view/ru.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/component.chartkit-alerts.view/ru.json Auto-merging src/i18n-keysets/component.collections-structure/en.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/component.collections-structure/en.json Auto-merging src/i18n-keysets/component.collections-structure/ru.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/component.collections-structure/ru.json Auto-merging src/i18n-keysets/component.dialog-relations.view/en.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/component.dialog-relations.view/en.json Auto-merging src/i18n-keysets/component.dialog-relations.view/ru.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/component.dialog-relations.view/ru.json Auto-merging src/i18n-keysets/editor.templates.view/en.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/editor.templates.view/en.json Auto-merging src/i18n-keysets/editor.templates.view/ru.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/editor.templates.view/ru.json Auto-merging src/i18n-keysets/new-workbooks/en.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/new-workbooks/en.json Auto-merging src/i18n-keysets/new-workbooks/ru.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/new-workbooks/ru.json Auto-merging src/i18n-keysets/wizard/en.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/wizard/en.json Auto-merging src/i18n-keysets/wizard/ru.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/wizard/ru.json Auto-merging src/server/components/charts-engine/components/__tests__/mocks/chart-validator.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/__tests__/mocks/chart-validator.ts Auto-merging src/server/components/charts-engine/components/chart-generator.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/chart-generator.ts Auto-merging src/server/components/charts-engine/components/chart-validator.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/chart-validator.ts Auto-merging src/server/components/charts-engine/components/processor/chart-api-context.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/processor/chart-api-context.ts Auto-merging src/server/components/charts-engine/components/processor/data-fetcher.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/processor/data-fetcher.ts Auto-merging src/server/components/charts-engine/components/processor/index.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/processor/index.ts Auto-merging src/server/components/charts-engine/components/processor/sources.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/processor/sources.ts Auto-merging src/server/components/charts-engine/components/processor/types.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/processor/types.ts Auto-merging src/server/components/charts-engine/components/processor/utils.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/processor/utils.ts Auto-merging src/server/components/charts-engine/components/storage/types.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/storage/types.ts Auto-merging src/server/components/charts-engine/components/storage/united-storage/provider.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/storage/united-storage/provider.ts Auto-merging src/server/components/charts-engine/controllers/charts.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/controllers/charts.ts Auto-merging src/server/components/charts-engine/controllers/embeds.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/controllers/embeds.ts Auto-merging src/server/components/charts-engine/controllers/run.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/controllers/run.ts Auto-merging src/server/components/charts-engine/types.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/types.ts Auto-merging src/server/configs/opensource/common.ts CONFLICT (add/add): Merge conflict in src/server/configs/opensource/common.ts Auto-merging src/server/controllers/api.ts CONFLICT (add/add): Merge conflict in src/server/controllers/api.ts Auto-merging src/server/controllers/dl-main.ts CONFLICT (add/add): Merge conflict in src/server/controllers/dl-main.ts Auto-merging src/server/controllers/index.ts CONFLICT (add/add): Merge conflict in src/server/controllers/index.ts Auto-merging src/server/controllers/navigate.ts CONFLICT (add/add): Merge conflict in src/server/controllers/navigate.ts Auto-merging src/server/controllers/navigation.ts CONFLICT (add/add): Merge conflict in src/server/controllers/navigation.ts Auto-merging src/server/modes/charts/plugins/datalens/chart-editor-module.ts CONFLICT (add/add): Merge conflict in src/server/modes/charts/plugins/datalens/chart-editor-module.ts Auto-merging src/server/modes/charts/plugins/datalens/js/index.ts CONFLICT (add/add): Merge conflict in src/server/modes/charts/plugins/datalens/js/index.ts Auto-merging src/server/modes/charts/plugins/dataset/v2.ts CONFLICT (add/add): Merge conflict in src/server/modes/charts/plugins/dataset/v2.ts Auto-merging src/server/modes/opensource/routes.ts CONFLICT (add/add): Merge conflict in src/server/modes/opensource/routes.ts Auto-merging src/server/utils/routes.ts CONFLICT (add/add): Merge conflict in src/server/utils/routes.ts Auto-merging src/shared/constants/common.ts CONFLICT (add/add): Merge conflict in src/shared/constants/common.ts Auto-merging src/shared/constants/entry.ts CONFLICT (add/add): Merge conflict in src/shared/constants/entry.ts Auto-merging src/shared/constants/qa/editor.ts CONFLICT (add/add): Merge conflict in src/shared/constants/qa/editor.ts Auto-merging src/shared/modules/charts-shared.ts CONFLICT (add/add): Merge conflict in src/shared/modules/charts-shared.ts Auto-merging src/shared/modules/format-units/formatUnit.ts CONFLICT (add/add): Merge conflict in src/shared/modules/format-units/formatUnit.ts Auto-merging src/shared/schema/mix/actions/editor.ts CONFLICT (add/add): Merge conflict in src/shared/schema/mix/actions/editor.ts Auto-merging src/shared/types/charts.ts CONFLICT (add/add): Merge conflict in src/shared/types/charts.ts Auto-merging src/shared/types/dataset.ts CONFLICT (add/add): Merge conflict in src/shared/types/dataset.ts Auto-merging src/shared/types/feature.ts CONFLICT (add/add): Merge conflict in src/shared/types/feature.ts Auto-merging src/shared/types/widget.ts CONFLICT (add/add): Merge conflict in src/shared/types/widget.ts Auto-merging src/ui/components/CollectionsStructure/AddDemoWorkbookDialog.tsx CONFLICT (add/add): Merge conflict in src/ui/components/CollectionsStructure/AddDemoWorkbookDialog.tsx Auto-merging src/ui/components/CollectionsStructure/CreateEntryInWorkbookDialog.tsx CONFLICT (add/add): Merge conflict in src/ui/components/CollectionsStructure/CreateEntryInWorkbookDialog.tsx Auto-merging src/ui/components/CollectionsStructure/EditWorkbookDialog.tsx CONFLICT (add/add): Merge conflict in src/ui/components/CollectionsStructure/EditWorkbookDialog.tsx Auto-merging src/ui/components/CollectionsStructure/WorkbookDialog/WorkbookDialog.scss CONFLICT (add/add): Merge conflict in src/ui/components/CollectionsStructure/WorkbookDialog/WorkbookDialog.scss Auto-merging src/ui/components/CollectionsStructure/WorkbookDialog/WorkbookDialog.tsx CONFLICT (add/add): Merge conflict in src/ui/components/CollectionsStructure/WorkbookDialog/WorkbookDialog.tsx Auto-merging src/ui/components/CollectionsStructure/WorkbookDialog/index.ts CONFLICT (add/add): Merge conflict in src/ui/components/CollectionsStructure/WorkbookDialog/index.ts Auto-merging src/ui/components/CollectionsStructure/index.ts CONFLICT (add/add): Merge conflict in src/ui/components/CollectionsStructure/index.ts Auto-merging src/ui/components/DashKit/utils.ts CONFLICT (add/add): Merge conflict in src/ui/components/DashKit/utils.ts Auto-merging src/ui/components/DialogCommon/DialogCommon.tsx CONFLICT (add/add): Merge conflict in src/ui/components/DialogCommon/DialogCommon.tsx Auto-merging src/ui/components/DialogErrorWithTabs/DialogErrorWithTabs.scss CONFLICT (add/add): Merge conflict in src/ui/components/DialogErrorWithTabs/DialogErrorWithTabs.scss Auto-merging src/ui/components/DialogErrorWithTabs/Tabs/DebugTab/DebugTab.tsx CONFLICT (add/add): Merge conflict in src/ui/components/DialogErrorWithTabs/Tabs/DebugTab/DebugTab.tsx Auto-merging src/ui/components/DialogRelations/constants.ts CONFLICT (add/add): Merge conflict in src/ui/components/DialogRelations/constants.ts Auto-merging src/ui/components/EntityIcon/EntityIcon.scss CONFLICT (add/add): Merge conflict in src/ui/components/EntityIcon/EntityIcon.scss Auto-merging src/ui/components/EntityIcon/EntityIcon.tsx CONFLICT (add/add): Merge conflict in src/ui/components/EntityIcon/EntityIcon.tsx Auto-merging src/ui/components/EntryIcon/EntryIcon.tsx CONFLICT (add/add): Merge conflict in src/ui/components/EntryIcon/EntryIcon.tsx Auto-merging src/ui/components/ErrorContent/ErrorContent.js CONFLICT (add/add): Merge conflict in src/ui/components/ErrorContent/ErrorContent.js Auto-merging src/ui/components/InterpolatedText/InterpolatedText.tsx CONFLICT (add/add): Merge conflict in src/ui/components/InterpolatedText/InterpolatedText.tsx Auto-merging src/ui/components/Navigation/Base/configure.ts CONFLICT (add/add): Merge conflict in src/ui/components/Navigation/Base/configure.ts Auto-merging src/ui/components/Navigation/Core/CreateEntry/CreateEntry.tsx CONFLICT (add/add): Merge conflict in src/ui/components/Navigation/Core/CreateEntry/CreateEntry.tsx Auto-merging src/ui/components/Navigation/Core/CreateEntry/CreateEntrySwitcher.tsx CONFLICT (add/add): Merge conflict in src/ui/components/Navigation/Core/CreateEntry/CreateEntrySwitcher.tsx Auto-merging src/ui/components/Navigation/Core/CreateEntry/getCreateEntryItems.tsx CONFLICT (add/add): Merge conflict in src/ui/components/Navigation/Core/CreateEntry/getCreateEntryItems.tsx Auto-merging src/ui/components/Navigation/dialogs/BatchMove/MoveError/MoveError.scss CONFLICT (add/add): Merge conflict in src/ui/components/Navigation/dialogs/BatchMove/MoveError/MoveError.scss Auto-merging src/ui/components/Progress/DialogCounterProgress.scss CONFLICT (add/add): Merge conflict in src/ui/components/Progress/DialogCounterProgress.scss Auto-merging src/ui/components/Progress/DialogCounterProgress.tsx CONFLICT (add/add): Merge conflict in src/ui/components/Progress/DialogCounterProgress.tsx Auto-merging src/ui/components/ViewAsync/ViewAsync.tsx CONFLICT (add/add): Merge conflict in src/ui/components/ViewAsync/ViewAsync.tsx Auto-merging src/ui/components/ViewError/ViewError.tsx CONFLICT (add/add): Merge conflict in src/ui/components/ViewError/ViewError.tsx Auto-merging src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/utils/render.tsx CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/utils/render.tsx Auto-merging src/ui/libs/DatalensChartkit/ChartKit/helpers/chartkit-adapter.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/helpers/chartkit-adapter.ts Auto-merging src/ui/libs/DatalensChartkit/ChartKit/plugins/index.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/plugins/index.ts Auto-merging src/ui/libs/DatalensChartkit/ChartKit/types.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/types.ts Auto-merging src/ui/libs/DatalensChartkit/modules/data-provider/charts/index.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/data-provider/charts/index.ts Auto-merging src/ui/libs/DatalensChartkit/modules/data-provider/charts/node.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/data-provider/charts/node.ts Auto-merging src/ui/libs/DatalensChartkit/modules/data-provider/charts/types.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/data-provider/charts/types.ts Auto-merging src/ui/libs/DatalensChartkit/modules/data-provider/charts/ui-sandbox.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/data-provider/charts/ui-sandbox.ts Auto-merging src/ui/libs/DatalensChartkit/modules/data-provider/charts/utils.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/data-provider/charts/utils.ts Auto-merging src/ui/libs/DatalensChartkit/modules/html-generator/utils.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/html-generator/utils.ts Auto-merging src/ui/libs/DatalensChartkit/types/widget.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/types/widget.ts Auto-merging src/ui/registry/index.ts CONFLICT (add/add): Merge conflict in src/ui/registry/index.ts Auto-merging src/ui/registry/units/editor/components-map.tsx CONFLICT (add/add): Merge conflict in src/ui/registry/units/editor/components-map.tsx Auto-merging src/ui/registry/units/editor/constants/components.ts CONFLICT (add/add): Merge conflict in src/ui/registry/units/editor/constants/components.ts Auto-merging src/ui/registry/units/editor/register.tsx CONFLICT (add/add): Merge conflict in src/ui/registry/units/editor/register.tsx Auto-merging src/ui/registry/utils/register-app-plugins.tsx CONFLICT (add/add): Merge conflict in src/ui/registry/utils/register-app-plugins.tsx Auto-merging src/ui/store/actions/collectionsStructure.ts CONFLICT (add/add): Merge conflict in src/ui/store/actions/collectionsStructure.ts Auto-merging src/ui/store/actions/openDialogTypes.ts CONFLICT (add/add): Merge conflict in src/ui/store/actions/openDialogTypes.ts Auto-merging src/ui/store/constants/collectionsStructure.ts CONFLICT (add/add): Merge conflict in src/ui/store/constants/collectionsStructure.ts Auto-merging src/ui/store/reducers/collectionsStructure.ts CONFLICT (add/add): Merge conflict in src/ui/store/reducers/collectionsStructure.ts Auto-merging src/ui/store/selectors/collectionsStructure.ts CONFLICT (add/add): Merge conflict in src/ui/store/selectors/collectionsStructure.ts Auto-merging src/ui/styles/variables.scss CONFLICT (add/add): Merge conflict in src/ui/styles/variables.scss Auto-merging src/ui/units/auth/components/ChangePasswordDialog/ChangePasswordDialog.tsx CONFLICT (add/add): Merge conflict in src/ui/units/auth/components/ChangePasswordDialog/ChangePasswordDialog.tsx Auto-merging src/ui/units/auth/components/formControls/Password.tsx CONFLICT (add/add): Merge conflict in src/ui/units/auth/components/formControls/Password.tsx Auto-merging src/ui/units/collections/components/CollectionContent/hooks/useActions.tsx CONFLICT (add/add): Merge conflict in src/ui/units/collections/components/CollectionContent/hooks/useActions.tsx Auto-merging src/ui/units/connections/components/ConnectorForm/components/Label/Label.scss CONFLICT (add/add): Merge conflict in src/ui/units/connections/components/ConnectorForm/components/Label/Label.scss Auto-merging src/ui/units/connections/components/ConnectorForm/components/Label/Label.tsx CONFLICT (add/add): Merge conflict in src/ui/units/connections/components/ConnectorForm/components/Label/Label.tsx Auto-merging src/ui/units/connections/components/ConnectorsList/ConnectorsList.scss CONFLICT (add/add): Merge conflict in src/ui/units/connections/components/ConnectorsList/ConnectorsList.scss Auto-merging src/ui/units/connections/components/Page/components/CreateQlChartButton.tsx CONFLICT (add/add): Merge conflict in src/ui/units/connections/components/Page/components/CreateQlChartButton.tsx Auto-merging src/ui/units/connections/components/mixins.scss CONFLICT (add/add): Merge conflict in src/ui/units/connections/components/mixins.scss Auto-merging src/ui/units/dash/containers/Body/Body.scss CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Body/Body.scss Auto-merging src/ui/units/dash/containers/Body/Body.tsx CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Body/Body.tsx Auto-merging src/ui/units/dash/containers/Dialogs/utils.ts CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/utils.ts Auto-merging src/ui/units/dash/containers/FixedHeader/FixedHeader.scss CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/FixedHeader/FixedHeader.scss Auto-merging src/ui/units/dash/containers/FixedHeader/FixedHeader.tsx CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/FixedHeader/FixedHeader.tsx Auto-merging src/ui/units/dash/modules/constants.ts CONFLICT (add/add): Merge conflict in src/ui/units/dash/modules/constants.ts Auto-merging src/ui/units/datasets/components/DatasetTable/columns/Rls.tsx CONFLICT (add/add): Merge conflict in src/ui/units/datasets/components/DatasetTable/columns/Rls.tsx Auto-merging src/ui/units/datasets/components/RLSDialog/RLSDialog.tsx CONFLICT (add/add): Merge conflict in src/ui/units/datasets/components/RLSDialog/RLSDialog.tsx Auto-merging src/ui/units/datasets/containers/DatasetEditor/DatasetEditor.js CONFLICT (add/add): Merge conflict in src/ui/units/datasets/containers/DatasetEditor/DatasetEditor.js Auto-merging src/ui/units/datasets/store/actions/creators/dataset.js CONFLICT (add/add): Merge conflict in src/ui/units/datasets/store/actions/creators/dataset.js Auto-merging src/ui/units/datasets/store/constants.ts CONFLICT (add/add): Merge conflict in src/ui/units/datasets/store/constants.ts Auto-merging src/ui/units/datasets/store/reducers/dataset.ts CONFLICT (add/add): Merge conflict in src/ui/units/datasets/store/reducers/dataset.ts Auto-merging src/ui/units/datasets/store/selectors/dataset.ts CONFLICT (add/add): Merge conflict in src/ui/units/datasets/store/selectors/dataset.ts Auto-merging src/ui/units/editor/components/EditorPage/EditorPage.js CONFLICT (add/add): Merge conflict in src/ui/units/editor/components/EditorPage/EditorPage.js Auto-merging src/ui/units/editor/components/NewChart/NewChart.js CONFLICT (add/add): Merge conflict in src/ui/units/editor/components/NewChart/NewChart.js Auto-merging src/ui/units/editor/components/PaneViewSelect/PaneViewSelect.tsx CONFLICT (add/add): Merge conflict in src/ui/units/editor/components/PaneViewSelect/PaneViewSelect.tsx Auto-merging src/ui/units/editor/configs/chart/chart-editor-types.ts CONFLICT (add/add): Merge conflict in src/ui/units/editor/configs/chart/chart-editor-types.ts Auto-merging src/ui/units/editor/constants/common.ts CONFLICT (add/add): Merge conflict in src/ui/units/editor/constants/common.ts Auto-merging src/ui/units/editor/libs/monaco/types/types.js CONFLICT (add/add): Merge conflict in src/ui/units/editor/libs/monaco/types/types.js Auto-merging src/ui/units/editor/store/reducers/editor/editor.js CONFLICT (add/add): Merge conflict in src/ui/units/editor/store/reducers/editor/editor.js Auto-merging src/ui/units/editor/store/reducers/editor/editorTypedReducer.ts CONFLICT (add/add): Merge conflict in src/ui/units/editor/store/reducers/editor/editorTypedReducer.ts Auto-merging src/ui/units/editor/store/reducers/editor/helper.js CONFLICT (add/add): Merge conflict in src/ui/units/editor/store/reducers/editor/helper.js Auto-merging src/ui/units/editor/types/common.ts CONFLICT (add/add): Merge conflict in src/ui/units/editor/types/common.ts Auto-merging src/ui/units/service-settings/components/CreateUserForm/CreateUserForm.tsx CONFLICT (add/add): Merge conflict in src/ui/units/service-settings/components/CreateUserForm/CreateUserForm.tsx Auto-merging src/ui/units/service-settings/components/UsersList/UsersList.tsx CONFLICT (add/add): Merge conflict in src/ui/units/service-settings/components/UsersList/UsersList.tsx Auto-merging src/ui/units/wizard/components/AddField/AddField.tsx CONFLICT (add/add): Merge conflict in src/ui/units/wizard/components/AddField/AddField.tsx Auto-merging src/ui/units/wizard/components/PlaceholderActionIcon/PlaceholderActionIcon.scss CONFLICT (add/add): Merge conflict in src/ui/units/wizard/components/PlaceholderActionIcon/PlaceholderActionIcon.scss Auto-merging src/ui/units/wizard/components/PlaceholderActionIcon/PlaceholderActionIcon.tsx CONFLICT (add/add): Merge conflict in src/ui/units/wizard/components/PlaceholderActionIcon/PlaceholderActionIcon.tsx Auto-merging src/ui/units/wizard/components/ValuesList/ValuesList.scss CONFLICT (add/add): Merge conflict in src/ui/units/wizard/components/ValuesList/ValuesList.scss Auto-merging src/ui/units/wizard/components/ValuesList/ValuesList.tsx CONFLICT (add/add): Merge conflict in src/ui/units/wizard/components/ValuesList/ValuesList.tsx Auto-merging src/ui/units/wizard/containers/Wizard/SectionVisualization/PlaceholdersContainer/ColorsPlaceholder/ColorsPlaceholder.tsx CONFLICT (add/add): Merge conflict in src/ui/units/wizard/containers/Wizard/SectionVisualization/PlaceholdersContainer/ColorsPlaceholder/ColorsPlaceholder.tsx Auto-merging src/ui/units/wizard/containers/Wizard/SectionVisualization/PlaceholdersContainer/DashboardFiltersPlaceholder/DashboardFiltersPlaceholder.tsx CONFLICT (add/add): Merge conflict in src/ui/units/wizard/containers/Wizard/SectionVisualization/PlaceholdersContainer/DashboardFiltersPlaceholder/DashboardFiltersPlaceholder.tsx Auto-merging src/ui/units/wizard/containers/Wizard/SectionVisualization/PlaceholdersContainer/FiltersPlaceholder/FiltersPlaceholder.tsx CONFLICT (add/add): Merge conflict in src/ui/units/wizard/containers/Wizard/SectionVisualization/PlaceholdersContainer/FiltersPlaceholder/FiltersPlaceholder.tsx Auto-merging src/ui/units/wizard/containers/Wizard/SectionVisualization/PlaceholdersContainer/Placeholder/Placeholder.tsx CONFLICT (add/add): Merge conflict in src/ui/units/wizard/containers/Wizard/SectionVisualization/PlaceholdersContainer/Placeholder/Placeholder.tsx Auto-merging src/ui/units/wizard/containers/Wizard/SectionVisualization/PlaceholdersContainer/PlaceholdersContainer.tsx CONFLICT (add/add): Merge conflict in src/ui/units/wizard/containers/Wizard/SectionVisualization/PlaceholdersContainer/PlaceholdersContainer.tsx Auto-merging src/ui/units/wizard/containers/Wizard/SectionVisualization/PlaceholdersContainer/VisualizationPlaceholder/VisualizationPlaceholder.tsx CONFLICT (add/add): Merge conflict in src/ui/units/wizard/containers/Wizard/SectionVisualization/PlaceholdersContainer/VisualizationPlaceholder/VisualizationPlaceholder.tsx Auto-merging src/ui/units/workbooks/components/WorkbookActions/WorkbookActions.tsx CONFLICT (add/add): Merge conflict in src/ui/units/workbooks/components/WorkbookActions/WorkbookActions.tsx Auto-merging src/ui/utils/utils.ts CONFLICT (add/add): Merge conflict in src/ui/utils/utils.ts Auto-merging tests/page-objects/editor/EditorPage.ts CONFLICT (add/add): Merge conflict in tests/page-objects/editor/EditorPage.ts Auto-merging tests/suites/dash/widgets/renderCharts.test.ts CONFLICT (add/add): Merge conflict in tests/suites/dash/widgets/renderCharts.test.ts Auto-merging tests/suites/editor/actions/resetButton.test.ts CONFLICT (add/add): Merge conflict in tests/suites/editor/actions/resetButton.test.ts Auto-merging tests/suites/editor/common/initialLoad.test.ts CONFLICT (add/add): Merge conflict in tests/suites/editor/common/initialLoad.test.ts Auto-merging tests/suites/editor/errorProxy.test.ts CONFLICT (add/add): Merge conflict in tests/suites/editor/errorProxy.test.ts Auto-merging tests/suites/editor/templateExistance.test.ts CONFLICT (add/add): Merge conflict in tests/suites/editor/templateExistance.test.ts Auto-merging tests/suites/sql/common/loadChart.test.ts CONFLICT (add/add): Merge conflict in tests/suites/sql/common/loadChart.test.ts Auto-merging tests/suites/wizard/common/initialLoad.test.ts CONFLICT (add/add): Merge conflict in tests/suites/wizard/common/initialLoad.test.ts Auto-merging tests/utils/constants.ts CONFLICT (add/add): Merge conflict in tests/utils/constants.ts error: could not apply 32e1574b8... Next redesign iteration hint: Resolve all conflicts manually, mark them as resolved with hint: "git add/rm <conflicted_files>", then run "git rebase --continue". hint: You can instead skip this commit: run "git rebase --skip". hint: To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply 32e1574b8... Next redesign iteration (1) a month ago
robot-charts Repository rebase failed DataLens UI Opensource CHARTS-10604__1863 auth.dialog-change-password__1863	Rebasing (1/1) Auto-merging .github/workflows/i18n-check.yml CONFLICT (add/add): Merge conflict in .github/workflows/i18n-check.yml Auto-merging api/server/charts-engine.ts CONFLICT (add/add): Merge conflict in api/server/charts-engine.ts Auto-merging src/@types/nodekit.d.ts CONFLICT (add/add): Merge conflict in src/@types/nodekit.d.ts Auto-merging src/i18n-keysets/auth.form-controls/en.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/auth.form-controls/en.json Auto-merging src/i18n-keysets/auth.form-controls/ru.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/auth.form-controls/ru.json Auto-merging src/i18n-keysets/chartkit.menu/en.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/chartkit.menu/en.json Auto-merging src/i18n-keysets/chartkit.menu/ru.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/chartkit.menu/ru.json Auto-merging src/i18n-keysets/collections/en.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/collections/en.json Auto-merging src/i18n-keysets/collections/ru.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/collections/ru.json Auto-merging src/i18n-keysets/component.chartkit-alerts.view/en.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/component.chartkit-alerts.view/en.json Auto-merging src/i18n-keysets/component.chartkit-alerts.view/ru.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/component.chartkit-alerts.view/ru.json Auto-merging src/i18n-keysets/component.dialog-relations.view/en.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/component.dialog-relations.view/en.json Auto-merging src/i18n-keysets/component.dialog-relations.view/ru.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/component.dialog-relations.view/ru.json Auto-merging src/i18n-keysets/editor.templates.view/en.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/editor.templates.view/en.json Auto-merging src/i18n-keysets/editor.templates.view/ru.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/editor.templates.view/ru.json Auto-merging src/i18n-keysets/new-workbooks/en.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/new-workbooks/en.json Auto-merging src/i18n-keysets/new-workbooks/ru.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/new-workbooks/ru.json Auto-merging src/server/components/charts-engine/components/__tests__/mocks/chart-validator.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/__tests__/mocks/chart-validator.ts Auto-merging src/server/components/charts-engine/components/chart-generator.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/chart-generator.ts Auto-merging src/server/components/charts-engine/components/chart-validator.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/chart-validator.ts Auto-merging src/server/components/charts-engine/components/processor/chart-api-context.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/processor/chart-api-context.ts Auto-merging src/server/components/charts-engine/components/processor/data-fetcher.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/processor/data-fetcher.ts Auto-merging src/server/components/charts-engine/components/processor/index.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/processor/index.ts Auto-merging src/server/components/charts-engine/components/processor/types.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/processor/types.ts Auto-merging src/server/components/charts-engine/components/processor/utils.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/processor/utils.ts Auto-merging src/server/components/charts-engine/components/storage/types.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/storage/types.ts Auto-merging src/server/components/charts-engine/components/storage/united-storage/provider.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/storage/united-storage/provider.ts Auto-merging src/server/components/charts-engine/controllers/charts.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/controllers/charts.ts Auto-merging src/server/components/charts-engine/controllers/embeds.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/controllers/embeds.ts Auto-merging src/server/components/charts-engine/controllers/run.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/controllers/run.ts Auto-merging src/server/configs/opensource/common.ts CONFLICT (add/add): Merge conflict in src/server/configs/opensource/common.ts Auto-merging src/server/modes/charts/plugins/datalens/chart-editor-module.ts CONFLICT (add/add): Merge conflict in src/server/modes/charts/plugins/datalens/chart-editor-module.ts Auto-merging src/server/modes/charts/plugins/datalens/js/index.ts CONFLICT (add/add): Merge conflict in src/server/modes/charts/plugins/datalens/js/index.ts Auto-merging src/server/modes/charts/plugins/dataset/v2.ts CONFLICT (add/add): Merge conflict in src/server/modes/charts/plugins/dataset/v2.ts Auto-merging src/server/modes/opensource/routes.ts CONFLICT (add/add): Merge conflict in src/server/modes/opensource/routes.ts Auto-merging src/shared/constants/common.ts CONFLICT (add/add): Merge conflict in src/shared/constants/common.ts Auto-merging src/shared/constants/entry.ts CONFLICT (add/add): Merge conflict in src/shared/constants/entry.ts Auto-merging src/shared/constants/qa/editor.ts CONFLICT (add/add): Merge conflict in src/shared/constants/qa/editor.ts Auto-merging src/shared/modules/charts-shared.ts CONFLICT (add/add): Merge conflict in src/shared/modules/charts-shared.ts Auto-merging src/shared/modules/format-units/formatUnit.ts CONFLICT (add/add): Merge conflict in src/shared/modules/format-units/formatUnit.ts Auto-merging src/shared/schema/mix/actions/editor.ts CONFLICT (add/add): Merge conflict in src/shared/schema/mix/actions/editor.ts Auto-merging src/shared/types/charts.ts CONFLICT (add/add): Merge conflict in src/shared/types/charts.ts Auto-merging src/shared/types/feature.ts CONFLICT (add/add): Merge conflict in src/shared/types/feature.ts Auto-merging src/shared/types/widget.ts CONFLICT (add/add): Merge conflict in src/shared/types/widget.ts Auto-merging src/ui/components/CollectionsStructure/CreateEntryInWorkbookDialog.tsx CONFLICT (add/add): Merge conflict in src/ui/components/CollectionsStructure/CreateEntryInWorkbookDialog.tsx Auto-merging src/ui/components/DashKit/utils.ts CONFLICT (add/add): Merge conflict in src/ui/components/DashKit/utils.ts Auto-merging src/ui/components/DialogErrorWithTabs/DialogErrorWithTabs.scss CONFLICT (add/add): Merge conflict in src/ui/components/DialogErrorWithTabs/DialogErrorWithTabs.scss Auto-merging src/ui/components/DialogErrorWithTabs/Tabs/DebugTab/DebugTab.tsx CONFLICT (add/add): Merge conflict in src/ui/components/DialogErrorWithTabs/Tabs/DebugTab/DebugTab.tsx Auto-merging src/ui/components/DialogRelations/constants.ts CONFLICT (add/add): Merge conflict in src/ui/components/DialogRelations/constants.ts Auto-merging src/ui/components/EntityIcon/EntityIcon.scss CONFLICT (add/add): Merge conflict in src/ui/components/EntityIcon/EntityIcon.scss Auto-merging src/ui/components/EntityIcon/EntityIcon.tsx CONFLICT (add/add): Merge conflict in src/ui/components/EntityIcon/EntityIcon.tsx Auto-merging src/ui/components/EntryIcon/EntryIcon.tsx CONFLICT (add/add): Merge conflict in src/ui/components/EntryIcon/EntryIcon.tsx Auto-merging src/ui/components/InterpolatedText/InterpolatedText.tsx CONFLICT (add/add): Merge conflict in src/ui/components/InterpolatedText/InterpolatedText.tsx Auto-merging src/ui/components/Navigation/Core/CreateEntry/CreateEntry.tsx CONFLICT (add/add): Merge conflict in src/ui/components/Navigation/Core/CreateEntry/CreateEntry.tsx Auto-merging src/ui/components/Navigation/dialogs/BatchMove/MoveError/MoveError.scss CONFLICT (add/add): Merge conflict in src/ui/components/Navigation/dialogs/BatchMove/MoveError/MoveError.scss Auto-merging src/ui/components/Progress/DialogCounterProgress.scss CONFLICT (add/add): Merge conflict in src/ui/components/Progress/DialogCounterProgress.scss Auto-merging src/ui/components/Progress/DialogCounterProgress.tsx CONFLICT (add/add): Merge conflict in src/ui/components/Progress/DialogCounterProgress.tsx Auto-merging src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/utils/render.tsx CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/utils/render.tsx Auto-merging src/ui/libs/DatalensChartkit/ChartKit/helpers/chartkit-adapter.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/helpers/chartkit-adapter.ts Auto-merging src/ui/libs/DatalensChartkit/ChartKit/plugins/index.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/plugins/index.ts Auto-merging src/ui/libs/DatalensChartkit/ChartKit/types.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/types.ts Auto-merging src/ui/libs/DatalensChartkit/modules/data-provider/charts/index.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/data-provider/charts/index.ts Auto-merging src/ui/libs/DatalensChartkit/modules/data-provider/charts/node.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/data-provider/charts/node.ts Auto-merging src/ui/libs/DatalensChartkit/modules/data-provider/charts/types.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/data-provider/charts/types.ts Auto-merging src/ui/libs/DatalensChartkit/modules/data-provider/charts/ui-sandbox.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/data-provider/charts/ui-sandbox.ts Auto-merging src/ui/libs/DatalensChartkit/modules/data-provider/charts/utils.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/data-provider/charts/utils.ts Auto-merging src/ui/libs/DatalensChartkit/modules/html-generator/utils.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/html-generator/utils.ts Auto-merging src/ui/libs/DatalensChartkit/types/widget.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/types/widget.ts Auto-merging src/ui/registry/units/editor/components-map.tsx CONFLICT (add/add): Merge conflict in src/ui/registry/units/editor/components-map.tsx Auto-merging src/ui/registry/units/editor/constants/components.ts CONFLICT (add/add): Merge conflict in src/ui/registry/units/editor/constants/components.ts Auto-merging src/ui/registry/units/editor/register.tsx CONFLICT (add/add): Merge conflict in src/ui/registry/units/editor/register.tsx Auto-merging src/ui/store/actions/openDialogTypes.ts CONFLICT (add/add): Merge conflict in src/ui/store/actions/openDialogTypes.ts Auto-merging src/ui/styles/variables.scss CONFLICT (add/add): Merge conflict in src/ui/styles/variables.scss Auto-merging src/ui/units/auth/components/ChangePasswordDialog/ChangePasswordDialog.tsx CONFLICT (add/add): Merge conflict in src/ui/units/auth/components/ChangePasswordDialog/ChangePasswordDialog.tsx Auto-merging src/ui/units/auth/components/formControls/Password.tsx CONFLICT (add/add): Merge conflict in src/ui/units/auth/components/formControls/Password.tsx Auto-merging src/ui/units/collections/components/CollectionContent/hooks/useActions.tsx CONFLICT (add/add): Merge conflict in src/ui/units/collections/components/CollectionContent/hooks/useActions.tsx Auto-merging src/ui/units/connections/components/Page/components/CreateQlChartButton.tsx CONFLICT (add/add): Merge conflict in src/ui/units/connections/components/Page/components/CreateQlChartButton.tsx Auto-merging src/ui/units/dash/containers/Body/Body.scss CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Body/Body.scss Auto-merging src/ui/units/dash/containers/Body/Body.tsx CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Body/Body.tsx Auto-merging src/ui/units/dash/containers/Dialogs/utils.ts CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/utils.ts Auto-merging src/ui/units/dash/containers/FixedHeader/FixedHeader.scss CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/FixedHeader/FixedHeader.scss Auto-merging src/ui/units/dash/containers/FixedHeader/FixedHeader.tsx CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/FixedHeader/FixedHeader.tsx Auto-merging src/ui/units/dash/modules/constants.ts CONFLICT (add/add): Merge conflict in src/ui/units/dash/modules/constants.ts Auto-merging src/ui/units/editor/components/EditorPage/EditorPage.js CONFLICT (add/add): Merge conflict in src/ui/units/editor/components/EditorPage/EditorPage.js Auto-merging src/ui/units/editor/components/NewChart/NewChart.js CONFLICT (add/add): Merge conflict in src/ui/units/editor/components/NewChart/NewChart.js Auto-merging src/ui/units/editor/components/PaneViewSelect/PaneViewSelect.tsx CONFLICT (add/add): Merge conflict in src/ui/units/editor/components/PaneViewSelect/PaneViewSelect.tsx Auto-merging src/ui/units/editor/configs/chart/chart-editor-types.ts CONFLICT (add/add): Merge conflict in src/ui/units/editor/configs/chart/chart-editor-types.ts Auto-merging src/ui/units/editor/constants/common.ts CONFLICT (add/add): Merge conflict in src/ui/units/editor/constants/common.ts Auto-merging src/ui/units/editor/libs/monaco/types/types.js CONFLICT (add/add): Merge conflict in src/ui/units/editor/libs/monaco/types/types.js Auto-merging src/ui/units/editor/store/reducers/editor/editor.js CONFLICT (add/add): Merge conflict in src/ui/units/editor/store/reducers/editor/editor.js Auto-merging src/ui/units/editor/store/reducers/editor/editorTypedReducer.ts CONFLICT (add/add): Merge conflict in src/ui/units/editor/store/reducers/editor/editorTypedReducer.ts Auto-merging src/ui/units/editor/store/reducers/editor/helper.js CONFLICT (add/add): Merge conflict in src/ui/units/editor/store/reducers/editor/helper.js Auto-merging src/ui/units/editor/types/common.ts CONFLICT (add/add): Merge conflict in src/ui/units/editor/types/common.ts Auto-merging src/ui/units/service-settings/components/CreateUserForm/CreateUserForm.tsx CONFLICT (add/add): Merge conflict in src/ui/units/service-settings/components/CreateUserForm/CreateUserForm.tsx Auto-merging src/ui/units/workbooks/components/WorkbookActions/WorkbookActions.tsx CONFLICT (add/add): Merge conflict in src/ui/units/workbooks/components/WorkbookActions/WorkbookActions.tsx Auto-merging src/ui/utils/utils.ts CONFLICT (add/add): Merge conflict in src/ui/utils/utils.ts Auto-merging tests/page-objects/editor/EditorPage.ts CONFLICT (add/add): Merge conflict in tests/page-objects/editor/EditorPage.ts Auto-merging tests/suites/dash/widgets/renderCharts.test.ts CONFLICT (add/add): Merge conflict in tests/suites/dash/widgets/renderCharts.test.ts Auto-merging tests/suites/editor/actions/resetButton.test.ts CONFLICT (add/add): Merge conflict in tests/suites/editor/actions/resetButton.test.ts Auto-merging tests/suites/editor/common/initialLoad.test.ts CONFLICT (add/add): Merge conflict in tests/suites/editor/common/initialLoad.test.ts Auto-merging tests/suites/editor/errorProxy.test.ts CONFLICT (add/add): Merge conflict in tests/suites/editor/errorProxy.test.ts Auto-merging tests/suites/editor/templateExistance.test.ts CONFLICT (add/add): Merge conflict in tests/suites/editor/templateExistance.test.ts Auto-merging tests/suites/sql/common/loadChart.test.ts CONFLICT (add/add): Merge conflict in tests/suites/sql/common/loadChart.test.ts Auto-merging tests/suites/wizard/common/initialLoad.test.ts CONFLICT (add/add): Merge conflict in tests/suites/wizard/common/initialLoad.test.ts Auto-merging tests/utils/constants.ts CONFLICT (add/add): Merge conflict in tests/utils/constants.ts error: could not apply 32e1574b8... Next redesign iteration hint: Resolve all conflicts manually, mark them as resolved with hint: "git add/rm <conflicted_files>", then run "git rebase --continue". hint: You can instead skip this commit: run "git rebase --skip". hint: To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply 32e1574b8... Next redesign iteration (1) a month ago
robot-charts Repository rebase failed DataLens UI Opensource CHARTS-10604__1863 auth.dialog-change-password__1863	Rebasing (1/1) Auto-merging .github/workflows/i18n-check.yml CONFLICT (add/add): Merge conflict in .github/workflows/i18n-check.yml Auto-merging api/server/charts-engine.ts CONFLICT (add/add): Merge conflict in api/server/charts-engine.ts Auto-merging src/@types/nodekit.d.ts CONFLICT (add/add): Merge conflict in src/@types/nodekit.d.ts Auto-merging src/i18n-keysets/auth.form-controls/en.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/auth.form-controls/en.json Auto-merging src/i18n-keysets/auth.form-controls/ru.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/auth.form-controls/ru.json Auto-merging src/i18n-keysets/chartkit.menu/en.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/chartkit.menu/en.json Auto-merging src/i18n-keysets/chartkit.menu/ru.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/chartkit.menu/ru.json Auto-merging src/i18n-keysets/collections/en.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/collections/en.json Auto-merging src/i18n-keysets/collections/ru.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/collections/ru.json Auto-merging src/i18n-keysets/component.chartkit-alerts.view/en.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/component.chartkit-alerts.view/en.json Auto-merging src/i18n-keysets/component.chartkit-alerts.view/ru.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/component.chartkit-alerts.view/ru.json Auto-merging src/i18n-keysets/component.dialog-relations.view/en.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/component.dialog-relations.view/en.json Auto-merging src/i18n-keysets/component.dialog-relations.view/ru.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/component.dialog-relations.view/ru.json Auto-merging src/i18n-keysets/editor.templates.view/en.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/editor.templates.view/en.json Auto-merging src/i18n-keysets/editor.templates.view/ru.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/editor.templates.view/ru.json Auto-merging src/i18n-keysets/new-workbooks/en.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/new-workbooks/en.json Auto-merging src/i18n-keysets/new-workbooks/ru.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/new-workbooks/ru.json Auto-merging src/server/components/charts-engine/components/__tests__/mocks/chart-validator.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/__tests__/mocks/chart-validator.ts Auto-merging src/server/components/charts-engine/components/chart-generator.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/chart-generator.ts Auto-merging src/server/components/charts-engine/components/chart-validator.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/chart-validator.ts Auto-merging src/server/components/charts-engine/components/processor/chart-api-context.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/processor/chart-api-context.ts Auto-merging src/server/components/charts-engine/components/processor/data-fetcher.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/processor/data-fetcher.ts Auto-merging src/server/components/charts-engine/components/processor/index.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/processor/index.ts Auto-merging src/server/components/charts-engine/components/processor/types.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/processor/types.ts Auto-merging src/server/components/charts-engine/components/processor/utils.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/processor/utils.ts Auto-merging src/server/components/charts-engine/components/storage/types.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/storage/types.ts Auto-merging src/server/components/charts-engine/components/storage/united-storage/provider.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/storage/united-storage/provider.ts Auto-merging src/server/components/charts-engine/controllers/charts.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/controllers/charts.ts Auto-merging src/server/components/charts-engine/controllers/embeds.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/controllers/embeds.ts Auto-merging src/server/components/charts-engine/controllers/run.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/controllers/run.ts Auto-merging src/server/configs/opensource/common.ts CONFLICT (add/add): Merge conflict in src/server/configs/opensource/common.ts Auto-merging src/server/modes/charts/plugins/datalens/chart-editor-module.ts CONFLICT (add/add): Merge conflict in src/server/modes/charts/plugins/datalens/chart-editor-module.ts Auto-merging src/server/modes/charts/plugins/datalens/js/index.ts CONFLICT (add/add): Merge conflict in src/server/modes/charts/plugins/datalens/js/index.ts Auto-merging src/server/modes/charts/plugins/dataset/v2.ts CONFLICT (add/add): Merge conflict in src/server/modes/charts/plugins/dataset/v2.ts Auto-merging src/server/modes/opensource/routes.ts CONFLICT (add/add): Merge conflict in src/server/modes/opensource/routes.ts Auto-merging src/shared/constants/common.ts CONFLICT (add/add): Merge conflict in src/shared/constants/common.ts Auto-merging src/shared/constants/entry.ts CONFLICT (add/add): Merge conflict in src/shared/constants/entry.ts Auto-merging src/shared/constants/qa/editor.ts CONFLICT (add/add): Merge conflict in src/shared/constants/qa/editor.ts Auto-merging src/shared/modules/charts-shared.ts CONFLICT (add/add): Merge conflict in src/shared/modules/charts-shared.ts Auto-merging src/shared/modules/format-units/formatUnit.ts CONFLICT (add/add): Merge conflict in src/shared/modules/format-units/formatUnit.ts Auto-merging src/shared/schema/mix/actions/editor.ts CONFLICT (add/add): Merge conflict in src/shared/schema/mix/actions/editor.ts Auto-merging src/shared/types/charts.ts CONFLICT (add/add): Merge conflict in src/shared/types/charts.ts Auto-merging src/shared/types/feature.ts CONFLICT (add/add): Merge conflict in src/shared/types/feature.ts Auto-merging src/shared/types/widget.ts CONFLICT (add/add): Merge conflict in src/shared/types/widget.ts Auto-merging src/ui/components/CollectionsStructure/CreateEntryInWorkbookDialog.tsx CONFLICT (add/add): Merge conflict in src/ui/components/CollectionsStructure/CreateEntryInWorkbookDialog.tsx Auto-merging src/ui/components/DashKit/utils.ts CONFLICT (add/add): Merge conflict in src/ui/components/DashKit/utils.ts Auto-merging src/ui/components/DialogErrorWithTabs/DialogErrorWithTabs.scss CONFLICT (add/add): Merge conflict in src/ui/components/DialogErrorWithTabs/DialogErrorWithTabs.scss Auto-merging src/ui/components/DialogErrorWithTabs/Tabs/DebugTab/DebugTab.tsx CONFLICT (add/add): Merge conflict in src/ui/components/DialogErrorWithTabs/Tabs/DebugTab/DebugTab.tsx Auto-merging src/ui/components/DialogRelations/constants.ts CONFLICT (add/add): Merge conflict in src/ui/components/DialogRelations/constants.ts Auto-merging src/ui/components/EntityIcon/EntityIcon.scss CONFLICT (add/add): Merge conflict in src/ui/components/EntityIcon/EntityIcon.scss Auto-merging src/ui/components/EntityIcon/EntityIcon.tsx CONFLICT (add/add): Merge conflict in src/ui/components/EntityIcon/EntityIcon.tsx Auto-merging src/ui/components/EntryIcon/EntryIcon.tsx CONFLICT (add/add): Merge conflict in src/ui/components/EntryIcon/EntryIcon.tsx Auto-merging src/ui/components/InterpolatedText/InterpolatedText.tsx CONFLICT (add/add): Merge conflict in src/ui/components/InterpolatedText/InterpolatedText.tsx Auto-merging src/ui/components/Navigation/Core/CreateEntry/CreateEntry.tsx CONFLICT (add/add): Merge conflict in src/ui/components/Navigation/Core/CreateEntry/CreateEntry.tsx Auto-merging src/ui/components/Navigation/dialogs/BatchMove/MoveError/MoveError.scss CONFLICT (add/add): Merge conflict in src/ui/components/Navigation/dialogs/BatchMove/MoveError/MoveError.scss Auto-merging src/ui/components/Progress/DialogCounterProgress.scss CONFLICT (add/add): Merge conflict in src/ui/components/Progress/DialogCounterProgress.scss Auto-merging src/ui/components/Progress/DialogCounterProgress.tsx CONFLICT (add/add): Merge conflict in src/ui/components/Progress/DialogCounterProgress.tsx Auto-merging src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/utils/render.tsx CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/utils/render.tsx Auto-merging src/ui/libs/DatalensChartkit/ChartKit/helpers/chartkit-adapter.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/helpers/chartkit-adapter.ts Auto-merging src/ui/libs/DatalensChartkit/ChartKit/plugins/index.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/plugins/index.ts Auto-merging src/ui/libs/DatalensChartkit/ChartKit/types.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/types.ts Auto-merging src/ui/libs/DatalensChartkit/modules/data-provider/charts/index.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/data-provider/charts/index.ts Auto-merging src/ui/libs/DatalensChartkit/modules/data-provider/charts/node.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/data-provider/charts/node.ts Auto-merging src/ui/libs/DatalensChartkit/modules/data-provider/charts/types.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/data-provider/charts/types.ts Auto-merging src/ui/libs/DatalensChartkit/modules/data-provider/charts/ui-sandbox.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/data-provider/charts/ui-sandbox.ts Auto-merging src/ui/libs/DatalensChartkit/modules/data-provider/charts/utils.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/data-provider/charts/utils.ts Auto-merging src/ui/libs/DatalensChartkit/modules/html-generator/utils.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/html-generator/utils.ts Auto-merging src/ui/libs/DatalensChartkit/types/widget.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/types/widget.ts Auto-merging src/ui/registry/units/editor/components-map.tsx CONFLICT (add/add): Merge conflict in src/ui/registry/units/editor/components-map.tsx Auto-merging src/ui/registry/units/editor/constants/components.ts CONFLICT (add/add): Merge conflict in src/ui/registry/units/editor/constants/components.ts Auto-merging src/ui/registry/units/editor/register.tsx CONFLICT (add/add): Merge conflict in src/ui/registry/units/editor/register.tsx Auto-merging src/ui/store/actions/openDialogTypes.ts CONFLICT (add/add): Merge conflict in src/ui/store/actions/openDialogTypes.ts Auto-merging src/ui/styles/variables.scss CONFLICT (add/add): Merge conflict in src/ui/styles/variables.scss Auto-merging src/ui/units/auth/components/ChangePasswordDialog/ChangePasswordDialog.tsx CONFLICT (add/add): Merge conflict in src/ui/units/auth/components/ChangePasswordDialog/ChangePasswordDialog.tsx Auto-merging src/ui/units/auth/components/formControls/Password.tsx CONFLICT (add/add): Merge conflict in src/ui/units/auth/components/formControls/Password.tsx Auto-merging src/ui/units/collections/components/CollectionContent/hooks/useActions.tsx CONFLICT (add/add): Merge conflict in src/ui/units/collections/components/CollectionContent/hooks/useActions.tsx Auto-merging src/ui/units/connections/components/Page/components/CreateQlChartButton.tsx CONFLICT (add/add): Merge conflict in src/ui/units/connections/components/Page/components/CreateQlChartButton.tsx Auto-merging src/ui/units/dash/containers/Body/Body.scss CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Body/Body.scss Auto-merging src/ui/units/dash/containers/Body/Body.tsx CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Body/Body.tsx Auto-merging src/ui/units/dash/containers/Dialogs/utils.ts CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/utils.ts Auto-merging src/ui/units/dash/containers/FixedHeader/FixedHeader.scss CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/FixedHeader/FixedHeader.scss Auto-merging src/ui/units/dash/containers/FixedHeader/FixedHeader.tsx CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/FixedHeader/FixedHeader.tsx Auto-merging src/ui/units/dash/modules/constants.ts CONFLICT (add/add): Merge conflict in src/ui/units/dash/modules/constants.ts Auto-merging src/ui/units/editor/components/EditorPage/EditorPage.js CONFLICT (add/add): Merge conflict in src/ui/units/editor/components/EditorPage/EditorPage.js Auto-merging src/ui/units/editor/components/NewChart/NewChart.js CONFLICT (add/add): Merge conflict in src/ui/units/editor/components/NewChart/NewChart.js Auto-merging src/ui/units/editor/components/PaneViewSelect/PaneViewSelect.tsx CONFLICT (add/add): Merge conflict in src/ui/units/editor/components/PaneViewSelect/PaneViewSelect.tsx Auto-merging src/ui/units/editor/configs/chart/chart-editor-types.ts CONFLICT (add/add): Merge conflict in src/ui/units/editor/configs/chart/chart-editor-types.ts Auto-merging src/ui/units/editor/constants/common.ts CONFLICT (add/add): Merge conflict in src/ui/units/editor/constants/common.ts Auto-merging src/ui/units/editor/libs/monaco/types/types.js CONFLICT (add/add): Merge conflict in src/ui/units/editor/libs/monaco/types/types.js Auto-merging src/ui/units/editor/store/reducers/editor/editor.js CONFLICT (add/add): Merge conflict in src/ui/units/editor/store/reducers/editor/editor.js Auto-merging src/ui/units/editor/store/reducers/editor/editorTypedReducer.ts CONFLICT (add/add): Merge conflict in src/ui/units/editor/store/reducers/editor/editorTypedReducer.ts Auto-merging src/ui/units/editor/store/reducers/editor/helper.js CONFLICT (add/add): Merge conflict in src/ui/units/editor/store/reducers/editor/helper.js Auto-merging src/ui/units/editor/types/common.ts CONFLICT (add/add): Merge conflict in src/ui/units/editor/types/common.ts Auto-merging src/ui/units/service-settings/components/CreateUserForm/CreateUserForm.tsx CONFLICT (add/add): Merge conflict in src/ui/units/service-settings/components/CreateUserForm/CreateUserForm.tsx Auto-merging src/ui/units/workbooks/components/WorkbookActions/WorkbookActions.tsx CONFLICT (add/add): Merge conflict in src/ui/units/workbooks/components/WorkbookActions/WorkbookActions.tsx Auto-merging src/ui/utils/utils.ts CONFLICT (add/add): Merge conflict in src/ui/utils/utils.ts Auto-merging tests/page-objects/editor/EditorPage.ts CONFLICT (add/add): Merge conflict in tests/page-objects/editor/EditorPage.ts Auto-merging tests/suites/dash/widgets/renderCharts.test.ts CONFLICT (add/add): Merge conflict in tests/suites/dash/widgets/renderCharts.test.ts Auto-merging tests/suites/editor/actions/resetButton.test.ts CONFLICT (add/add): Merge conflict in tests/suites/editor/actions/resetButton.test.ts Auto-merging tests/suites/editor/common/initialLoad.test.ts CONFLICT (add/add): Merge conflict in tests/suites/editor/common/initialLoad.test.ts Auto-merging tests/suites/editor/errorProxy.test.ts CONFLICT (add/add): Merge conflict in tests/suites/editor/errorProxy.test.ts Auto-merging tests/suites/editor/templateExistance.test.ts CONFLICT (add/add): Merge conflict in tests/suites/editor/templateExistance.test.ts Auto-merging tests/suites/sql/common/loadChart.test.ts CONFLICT (add/add): Merge conflict in tests/suites/sql/common/loadChart.test.ts Auto-merging tests/suites/wizard/common/initialLoad.test.ts CONFLICT (add/add): Merge conflict in tests/suites/wizard/common/initialLoad.test.ts Auto-merging tests/utils/constants.ts CONFLICT (add/add): Merge conflict in tests/utils/constants.ts error: could not apply 32e1574b8... Next redesign iteration hint: Resolve all conflicts manually, mark them as resolved with hint: "git add/rm <conflicted_files>", then run "git rebase --continue". hint: You can instead skip this commit: run "git rebase --skip". hint: To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply 32e1574b8... Next redesign iteration (1) a month ago
None Alert triggered DataLens UI Opensource CHARTS-10604__1863 auth.dialog-change-password__1863	Repository outdated. a month ago
robot-charts Repository rebase failed DataLens UI Opensource CHARTS-10604__1863 auth.dialog-change-password__1863	Rebasing (1/1) Auto-merging .github/workflows/i18n-check.yml CONFLICT (add/add): Merge conflict in .github/workflows/i18n-check.yml Auto-merging api/server/charts-engine.ts CONFLICT (add/add): Merge conflict in api/server/charts-engine.ts Auto-merging src/@types/nodekit.d.ts CONFLICT (add/add): Merge conflict in src/@types/nodekit.d.ts Auto-merging src/i18n-keysets/auth.form-controls/en.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/auth.form-controls/en.json Auto-merging src/i18n-keysets/auth.form-controls/ru.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/auth.form-controls/ru.json Auto-merging src/i18n-keysets/chartkit.menu/en.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/chartkit.menu/en.json Auto-merging src/i18n-keysets/chartkit.menu/ru.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/chartkit.menu/ru.json Auto-merging src/i18n-keysets/collections/en.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/collections/en.json Auto-merging src/i18n-keysets/collections/ru.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/collections/ru.json Auto-merging src/i18n-keysets/component.chartkit-alerts.view/en.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/component.chartkit-alerts.view/en.json Auto-merging src/i18n-keysets/component.chartkit-alerts.view/ru.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/component.chartkit-alerts.view/ru.json Auto-merging src/i18n-keysets/component.dialog-relations.view/en.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/component.dialog-relations.view/en.json Auto-merging src/i18n-keysets/component.dialog-relations.view/ru.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/component.dialog-relations.view/ru.json Auto-merging src/i18n-keysets/editor.templates.view/en.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/editor.templates.view/en.json Auto-merging src/i18n-keysets/editor.templates.view/ru.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/editor.templates.view/ru.json Auto-merging src/i18n-keysets/new-workbooks/en.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/new-workbooks/en.json Auto-merging src/i18n-keysets/new-workbooks/ru.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/new-workbooks/ru.json Auto-merging src/server/components/charts-engine/components/__tests__/mocks/chart-validator.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/__tests__/mocks/chart-validator.ts Auto-merging src/server/components/charts-engine/components/chart-generator.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/chart-generator.ts Auto-merging src/server/components/charts-engine/components/chart-validator.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/chart-validator.ts Auto-merging src/server/components/charts-engine/components/processor/chart-api-context.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/processor/chart-api-context.ts Auto-merging src/server/components/charts-engine/components/processor/data-fetcher.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/processor/data-fetcher.ts Auto-merging src/server/components/charts-engine/components/processor/index.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/processor/index.ts Auto-merging src/server/components/charts-engine/components/processor/types.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/processor/types.ts Auto-merging src/server/components/charts-engine/components/processor/utils.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/processor/utils.ts Auto-merging src/server/components/charts-engine/components/storage/types.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/storage/types.ts Auto-merging src/server/components/charts-engine/components/storage/united-storage/provider.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/storage/united-storage/provider.ts Auto-merging src/server/components/charts-engine/controllers/charts.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/controllers/charts.ts Auto-merging src/server/components/charts-engine/controllers/embeds.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/controllers/embeds.ts Auto-merging src/server/components/charts-engine/controllers/run.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/controllers/run.ts Auto-merging src/server/configs/opensource/common.ts CONFLICT (add/add): Merge conflict in src/server/configs/opensource/common.ts Auto-merging src/server/modes/charts/plugins/datalens/chart-editor-module.ts CONFLICT (add/add): Merge conflict in src/server/modes/charts/plugins/datalens/chart-editor-module.ts Auto-merging src/server/modes/charts/plugins/datalens/js/index.ts CONFLICT (add/add): Merge conflict in src/server/modes/charts/plugins/datalens/js/index.ts Auto-merging src/server/modes/charts/plugins/dataset/v2.ts CONFLICT (add/add): Merge conflict in src/server/modes/charts/plugins/dataset/v2.ts Auto-merging src/server/modes/opensource/routes.ts CONFLICT (add/add): Merge conflict in src/server/modes/opensource/routes.ts Auto-merging src/shared/constants/common.ts CONFLICT (add/add): Merge conflict in src/shared/constants/common.ts Auto-merging src/shared/constants/entry.ts CONFLICT (add/add): Merge conflict in src/shared/constants/entry.ts Auto-merging src/shared/constants/qa/editor.ts CONFLICT (add/add): Merge conflict in src/shared/constants/qa/editor.ts Auto-merging src/shared/modules/charts-shared.ts CONFLICT (add/add): Merge conflict in src/shared/modules/charts-shared.ts Auto-merging src/shared/modules/format-units/formatUnit.ts CONFLICT (add/add): Merge conflict in src/shared/modules/format-units/formatUnit.ts Auto-merging src/shared/schema/mix/actions/editor.ts CONFLICT (add/add): Merge conflict in src/shared/schema/mix/actions/editor.ts Auto-merging src/shared/types/charts.ts CONFLICT (add/add): Merge conflict in src/shared/types/charts.ts Auto-merging src/shared/types/feature.ts CONFLICT (add/add): Merge conflict in src/shared/types/feature.ts Auto-merging src/shared/types/widget.ts CONFLICT (add/add): Merge conflict in src/shared/types/widget.ts Auto-merging src/ui/components/CollectionsStructure/CreateEntryInWorkbookDialog.tsx CONFLICT (add/add): Merge conflict in src/ui/components/CollectionsStructure/CreateEntryInWorkbookDialog.tsx Auto-merging src/ui/components/DialogErrorWithTabs/DialogErrorWithTabs.scss CONFLICT (add/add): Merge conflict in src/ui/components/DialogErrorWithTabs/DialogErrorWithTabs.scss Auto-merging src/ui/components/DialogErrorWithTabs/Tabs/DebugTab/DebugTab.tsx CONFLICT (add/add): Merge conflict in src/ui/components/DialogErrorWithTabs/Tabs/DebugTab/DebugTab.tsx Auto-merging src/ui/components/DialogRelations/constants.ts CONFLICT (add/add): Merge conflict in src/ui/components/DialogRelations/constants.ts Auto-merging src/ui/components/EntityIcon/EntityIcon.scss CONFLICT (add/add): Merge conflict in src/ui/components/EntityIcon/EntityIcon.scss Auto-merging src/ui/components/EntityIcon/EntityIcon.tsx CONFLICT (add/add): Merge conflict in src/ui/components/EntityIcon/EntityIcon.tsx Auto-merging src/ui/components/EntryIcon/EntryIcon.tsx CONFLICT (add/add): Merge conflict in src/ui/components/EntryIcon/EntryIcon.tsx Auto-merging src/ui/components/InterpolatedText/InterpolatedText.tsx CONFLICT (add/add): Merge conflict in src/ui/components/InterpolatedText/InterpolatedText.tsx Auto-merging src/ui/components/Navigation/Core/CreateEntry/CreateEntry.tsx CONFLICT (add/add): Merge conflict in src/ui/components/Navigation/Core/CreateEntry/CreateEntry.tsx Auto-merging src/ui/components/Navigation/dialogs/BatchMove/MoveError/MoveError.scss CONFLICT (add/add): Merge conflict in src/ui/components/Navigation/dialogs/BatchMove/MoveError/MoveError.scss Auto-merging src/ui/components/Progress/DialogCounterProgress.scss CONFLICT (add/add): Merge conflict in src/ui/components/Progress/DialogCounterProgress.scss Auto-merging src/ui/components/Progress/DialogCounterProgress.tsx CONFLICT (add/add): Merge conflict in src/ui/components/Progress/DialogCounterProgress.tsx Auto-merging src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/utils/render.tsx CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/utils/render.tsx Auto-merging src/ui/libs/DatalensChartkit/ChartKit/helpers/chartkit-adapter.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/helpers/chartkit-adapter.ts Auto-merging src/ui/libs/DatalensChartkit/ChartKit/plugins/index.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/plugins/index.ts Auto-merging src/ui/libs/DatalensChartkit/ChartKit/types.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/types.ts Auto-merging src/ui/libs/DatalensChartkit/modules/data-provider/charts/index.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/data-provider/charts/index.ts Auto-merging src/ui/libs/DatalensChartkit/modules/data-provider/charts/node.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/data-provider/charts/node.ts Auto-merging src/ui/libs/DatalensChartkit/modules/data-provider/charts/types.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/data-provider/charts/types.ts Auto-merging src/ui/libs/DatalensChartkit/modules/data-provider/charts/ui-sandbox.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/data-provider/charts/ui-sandbox.ts Auto-merging src/ui/libs/DatalensChartkit/modules/data-provider/charts/utils.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/data-provider/charts/utils.ts Auto-merging src/ui/libs/DatalensChartkit/modules/html-generator/utils.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/html-generator/utils.ts Auto-merging src/ui/libs/DatalensChartkit/types/widget.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/types/widget.ts Auto-merging src/ui/registry/units/editor/components-map.tsx CONFLICT (add/add): Merge conflict in src/ui/registry/units/editor/components-map.tsx Auto-merging src/ui/registry/units/editor/constants/components.ts CONFLICT (add/add): Merge conflict in src/ui/registry/units/editor/constants/components.ts Auto-merging src/ui/registry/units/editor/register.tsx CONFLICT (add/add): Merge conflict in src/ui/registry/units/editor/register.tsx Auto-merging src/ui/store/actions/openDialogTypes.ts CONFLICT (add/add): Merge conflict in src/ui/store/actions/openDialogTypes.ts Auto-merging src/ui/styles/variables.scss CONFLICT (add/add): Merge conflict in src/ui/styles/variables.scss Auto-merging src/ui/units/auth/components/ChangePasswordDialog/ChangePasswordDialog.tsx CONFLICT (add/add): Merge conflict in src/ui/units/auth/components/ChangePasswordDialog/ChangePasswordDialog.tsx Auto-merging src/ui/units/auth/components/formControls/Password.tsx CONFLICT (add/add): Merge conflict in src/ui/units/auth/components/formControls/Password.tsx Auto-merging src/ui/units/collections/components/CollectionContent/hooks/useActions.tsx CONFLICT (add/add): Merge conflict in src/ui/units/collections/components/CollectionContent/hooks/useActions.tsx Auto-merging src/ui/units/connections/components/Page/components/CreateQlChartButton.tsx CONFLICT (add/add): Merge conflict in src/ui/units/connections/components/Page/components/CreateQlChartButton.tsx Auto-merging src/ui/units/dash/containers/Body/Body.scss CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Body/Body.scss Auto-merging src/ui/units/dash/containers/Body/Body.tsx CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Body/Body.tsx Auto-merging src/ui/units/dash/containers/Dialogs/utils.ts CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/utils.ts Auto-merging src/ui/units/dash/containers/FixedHeader/FixedHeader.scss CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/FixedHeader/FixedHeader.scss Auto-merging src/ui/units/dash/containers/FixedHeader/FixedHeader.tsx CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/FixedHeader/FixedHeader.tsx Auto-merging src/ui/units/dash/modules/constants.ts CONFLICT (add/add): Merge conflict in src/ui/units/dash/modules/constants.ts Auto-merging src/ui/units/editor/components/EditorPage/EditorPage.js CONFLICT (add/add): Merge conflict in src/ui/units/editor/components/EditorPage/EditorPage.js Auto-merging src/ui/units/editor/components/NewChart/NewChart.js CONFLICT (add/add): Merge conflict in src/ui/units/editor/components/NewChart/NewChart.js Auto-merging src/ui/units/editor/components/PaneViewSelect/PaneViewSelect.tsx CONFLICT (add/add): Merge conflict in src/ui/units/editor/components/PaneViewSelect/PaneViewSelect.tsx Auto-merging src/ui/units/editor/configs/chart/chart-editor-types.ts CONFLICT (add/add): Merge conflict in src/ui/units/editor/configs/chart/chart-editor-types.ts Auto-merging src/ui/units/editor/constants/common.ts CONFLICT (add/add): Merge conflict in src/ui/units/editor/constants/common.ts Auto-merging src/ui/units/editor/libs/monaco/types/types.js CONFLICT (add/add): Merge conflict in src/ui/units/editor/libs/monaco/types/types.js Auto-merging src/ui/units/editor/store/reducers/editor/editor.js CONFLICT (add/add): Merge conflict in src/ui/units/editor/store/reducers/editor/editor.js Auto-merging src/ui/units/editor/store/reducers/editor/editorTypedReducer.ts CONFLICT (add/add): Merge conflict in src/ui/units/editor/store/reducers/editor/editorTypedReducer.ts Auto-merging src/ui/units/editor/store/reducers/editor/helper.js CONFLICT (add/add): Merge conflict in src/ui/units/editor/store/reducers/editor/helper.js Auto-merging src/ui/units/editor/types/common.ts CONFLICT (add/add): Merge conflict in src/ui/units/editor/types/common.ts Auto-merging src/ui/units/service-settings/components/CreateUserForm/CreateUserForm.tsx CONFLICT (add/add): Merge conflict in src/ui/units/service-settings/components/CreateUserForm/CreateUserForm.tsx Auto-merging src/ui/units/workbooks/components/WorkbookActions/WorkbookActions.tsx CONFLICT (add/add): Merge conflict in src/ui/units/workbooks/components/WorkbookActions/WorkbookActions.tsx Auto-merging src/ui/utils/utils.ts CONFLICT (add/add): Merge conflict in src/ui/utils/utils.ts Auto-merging tests/page-objects/editor/EditorPage.ts CONFLICT (add/add): Merge conflict in tests/page-objects/editor/EditorPage.ts Auto-merging tests/suites/dash/widgets/renderCharts.test.ts CONFLICT (add/add): Merge conflict in tests/suites/dash/widgets/renderCharts.test.ts Auto-merging tests/suites/editor/actions/resetButton.test.ts CONFLICT (add/add): Merge conflict in tests/suites/editor/actions/resetButton.test.ts Auto-merging tests/suites/editor/common/initialLoad.test.ts CONFLICT (add/add): Merge conflict in tests/suites/editor/common/initialLoad.test.ts Auto-merging tests/suites/editor/errorProxy.test.ts CONFLICT (add/add): Merge conflict in tests/suites/editor/errorProxy.test.ts Auto-merging tests/suites/editor/templateExistance.test.ts CONFLICT (add/add): Merge conflict in tests/suites/editor/templateExistance.test.ts Auto-merging tests/suites/sql/common/loadChart.test.ts CONFLICT (add/add): Merge conflict in tests/suites/sql/common/loadChart.test.ts Auto-merging tests/suites/wizard/common/initialLoad.test.ts CONFLICT (add/add): Merge conflict in tests/suites/wizard/common/initialLoad.test.ts Auto-merging tests/utils/constants.ts CONFLICT (add/add): Merge conflict in tests/utils/constants.ts error: could not apply 32e1574b8... Next redesign iteration hint: Resolve all conflicts manually, mark them as resolved with hint: "git add/rm <conflicted_files>", then run "git rebase --continue". hint: You can instead skip this commit: run "git rebase --skip". hint: To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply 32e1574b8... Next redesign iteration (1) a month ago
robot-charts Repository rebase failed DataLens UI Opensource CHARTS-10604__1863 auth.dialog-change-password__1863	Rebasing (1/1) Auto-merging .github/workflows/i18n-check.yml CONFLICT (add/add): Merge conflict in .github/workflows/i18n-check.yml Auto-merging api/server/charts-engine.ts CONFLICT (add/add): Merge conflict in api/server/charts-engine.ts Auto-merging src/@types/nodekit.d.ts CONFLICT (add/add): Merge conflict in src/@types/nodekit.d.ts Auto-merging src/i18n-keysets/auth.form-controls/en.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/auth.form-controls/en.json Auto-merging src/i18n-keysets/auth.form-controls/ru.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/auth.form-controls/ru.json Auto-merging src/i18n-keysets/chartkit.menu/en.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/chartkit.menu/en.json Auto-merging src/i18n-keysets/chartkit.menu/ru.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/chartkit.menu/ru.json Auto-merging src/i18n-keysets/component.chartkit-alerts.view/en.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/component.chartkit-alerts.view/en.json Auto-merging src/i18n-keysets/component.chartkit-alerts.view/ru.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/component.chartkit-alerts.view/ru.json Auto-merging src/i18n-keysets/component.dialog-relations.view/en.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/component.dialog-relations.view/en.json Auto-merging src/i18n-keysets/component.dialog-relations.view/ru.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/component.dialog-relations.view/ru.json Auto-merging src/i18n-keysets/editor.templates.view/en.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/editor.templates.view/en.json Auto-merging src/i18n-keysets/editor.templates.view/ru.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/editor.templates.view/ru.json Auto-merging src/server/components/charts-engine/components/__tests__/mocks/chart-validator.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/__tests__/mocks/chart-validator.ts Auto-merging src/server/components/charts-engine/components/chart-generator.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/chart-generator.ts Auto-merging src/server/components/charts-engine/components/chart-validator.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/chart-validator.ts Auto-merging src/server/components/charts-engine/components/processor/chart-api-context.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/processor/chart-api-context.ts Auto-merging src/server/components/charts-engine/components/processor/index.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/processor/index.ts Auto-merging src/server/components/charts-engine/components/processor/types.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/processor/types.ts Auto-merging src/server/components/charts-engine/components/processor/utils.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/processor/utils.ts Auto-merging src/server/components/charts-engine/components/storage/types.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/storage/types.ts Auto-merging src/server/components/charts-engine/components/storage/united-storage/provider.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/storage/united-storage/provider.ts Auto-merging src/server/components/charts-engine/controllers/charts.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/controllers/charts.ts Auto-merging src/server/components/charts-engine/controllers/embeds.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/controllers/embeds.ts Auto-merging src/server/components/charts-engine/controllers/run.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/controllers/run.ts Auto-merging src/server/configs/opensource/common.ts CONFLICT (add/add): Merge conflict in src/server/configs/opensource/common.ts Auto-merging src/server/modes/charts/plugins/dataset/v2.ts CONFLICT (add/add): Merge conflict in src/server/modes/charts/plugins/dataset/v2.ts Auto-merging src/server/modes/opensource/routes.ts CONFLICT (add/add): Merge conflict in src/server/modes/opensource/routes.ts Auto-merging src/shared/constants/common.ts CONFLICT (add/add): Merge conflict in src/shared/constants/common.ts Auto-merging src/shared/constants/entry.ts CONFLICT (add/add): Merge conflict in src/shared/constants/entry.ts Auto-merging src/shared/constants/qa/editor.ts CONFLICT (add/add): Merge conflict in src/shared/constants/qa/editor.ts Auto-merging src/shared/modules/charts-shared.ts CONFLICT (add/add): Merge conflict in src/shared/modules/charts-shared.ts Auto-merging src/shared/modules/format-units/formatUnit.ts CONFLICT (add/add): Merge conflict in src/shared/modules/format-units/formatUnit.ts Auto-merging src/shared/schema/mix/actions/editor.ts CONFLICT (add/add): Merge conflict in src/shared/schema/mix/actions/editor.ts Auto-merging src/shared/types/charts.ts CONFLICT (add/add): Merge conflict in src/shared/types/charts.ts Auto-merging src/shared/types/feature.ts CONFLICT (add/add): Merge conflict in src/shared/types/feature.ts Auto-merging src/shared/types/widget.ts CONFLICT (add/add): Merge conflict in src/shared/types/widget.ts Auto-merging src/ui/components/CollectionsStructure/CreateEntryInWorkbookDialog.tsx CONFLICT (add/add): Merge conflict in src/ui/components/CollectionsStructure/CreateEntryInWorkbookDialog.tsx Auto-merging src/ui/components/DialogErrorWithTabs/DialogErrorWithTabs.scss CONFLICT (add/add): Merge conflict in src/ui/components/DialogErrorWithTabs/DialogErrorWithTabs.scss Auto-merging src/ui/components/DialogErrorWithTabs/Tabs/DebugTab/DebugTab.tsx CONFLICT (add/add): Merge conflict in src/ui/components/DialogErrorWithTabs/Tabs/DebugTab/DebugTab.tsx Auto-merging src/ui/components/DialogRelations/constants.ts CONFLICT (add/add): Merge conflict in src/ui/components/DialogRelations/constants.ts Auto-merging src/ui/components/EntityIcon/EntityIcon.scss CONFLICT (add/add): Merge conflict in src/ui/components/EntityIcon/EntityIcon.scss Auto-merging src/ui/components/EntityIcon/EntityIcon.tsx CONFLICT (add/add): Merge conflict in src/ui/components/EntityIcon/EntityIcon.tsx Auto-merging src/ui/components/EntryIcon/EntryIcon.tsx CONFLICT (add/add): Merge conflict in src/ui/components/EntryIcon/EntryIcon.tsx Auto-merging src/ui/components/Navigation/Core/CreateEntry/CreateEntry.tsx CONFLICT (add/add): Merge conflict in src/ui/components/Navigation/Core/CreateEntry/CreateEntry.tsx Auto-merging src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/utils/render.tsx CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/utils/render.tsx Auto-merging src/ui/libs/DatalensChartkit/ChartKit/helpers/chartkit-adapter.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/helpers/chartkit-adapter.ts Auto-merging src/ui/libs/DatalensChartkit/ChartKit/plugins/index.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/plugins/index.ts Auto-merging src/ui/libs/DatalensChartkit/ChartKit/types.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/types.ts Auto-merging src/ui/libs/DatalensChartkit/modules/data-provider/charts/index.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/data-provider/charts/index.ts Auto-merging src/ui/libs/DatalensChartkit/modules/data-provider/charts/node.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/data-provider/charts/node.ts Auto-merging src/ui/libs/DatalensChartkit/modules/data-provider/charts/types.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/data-provider/charts/types.ts Auto-merging src/ui/libs/DatalensChartkit/modules/data-provider/charts/ui-sandbox.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/data-provider/charts/ui-sandbox.ts Auto-merging src/ui/libs/DatalensChartkit/modules/data-provider/charts/utils.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/data-provider/charts/utils.ts Auto-merging src/ui/libs/DatalensChartkit/modules/html-generator/utils.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/html-generator/utils.ts Auto-merging src/ui/libs/DatalensChartkit/types/widget.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/types/widget.ts Auto-merging src/ui/registry/units/editor/components-map.tsx CONFLICT (add/add): Merge conflict in src/ui/registry/units/editor/components-map.tsx Auto-merging src/ui/registry/units/editor/constants/components.ts CONFLICT (add/add): Merge conflict in src/ui/registry/units/editor/constants/components.ts Auto-merging src/ui/registry/units/editor/register.tsx CONFLICT (add/add): Merge conflict in src/ui/registry/units/editor/register.tsx Auto-merging src/ui/units/auth/components/ChangePasswordDialog/ChangePasswordDialog.tsx CONFLICT (add/add): Merge conflict in src/ui/units/auth/components/ChangePasswordDialog/ChangePasswordDialog.tsx Auto-merging src/ui/units/auth/components/formControls/Password.tsx CONFLICT (add/add): Merge conflict in src/ui/units/auth/components/formControls/Password.tsx Auto-merging src/ui/units/connections/components/Page/components/CreateQlChartButton.tsx CONFLICT (add/add): Merge conflict in src/ui/units/connections/components/Page/components/CreateQlChartButton.tsx Auto-merging src/ui/units/dash/containers/Body/Body.scss CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Body/Body.scss Auto-merging src/ui/units/dash/containers/Body/Body.tsx CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Body/Body.tsx Auto-merging src/ui/units/dash/containers/Dialogs/utils.ts CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/utils.ts Auto-merging src/ui/units/dash/containers/FixedHeader/FixedHeader.scss CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/FixedHeader/FixedHeader.scss Auto-merging src/ui/units/dash/containers/FixedHeader/FixedHeader.tsx CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/FixedHeader/FixedHeader.tsx Auto-merging src/ui/units/dash/modules/constants.ts CONFLICT (add/add): Merge conflict in src/ui/units/dash/modules/constants.ts Auto-merging src/ui/units/editor/components/NewChart/NewChart.js CONFLICT (add/add): Merge conflict in src/ui/units/editor/components/NewChart/NewChart.js Auto-merging src/ui/units/editor/configs/chart/chart-editor-types.ts CONFLICT (add/add): Merge conflict in src/ui/units/editor/configs/chart/chart-editor-types.ts Auto-merging src/ui/units/editor/constants/common.ts CONFLICT (add/add): Merge conflict in src/ui/units/editor/constants/common.ts Auto-merging src/ui/units/editor/libs/monaco/types/types.js CONFLICT (add/add): Merge conflict in src/ui/units/editor/libs/monaco/types/types.js Auto-merging src/ui/units/editor/store/reducers/editor/editor.js CONFLICT (add/add): Merge conflict in src/ui/units/editor/store/reducers/editor/editor.js Auto-merging src/ui/units/editor/store/reducers/editor/editorTypedReducer.ts CONFLICT (add/add): Merge conflict in src/ui/units/editor/store/reducers/editor/editorTypedReducer.ts Auto-merging src/ui/units/editor/store/reducers/editor/helper.js CONFLICT (add/add): Merge conflict in src/ui/units/editor/store/reducers/editor/helper.js Auto-merging src/ui/units/editor/types/common.ts CONFLICT (add/add): Merge conflict in src/ui/units/editor/types/common.ts Auto-merging src/ui/units/service-settings/components/CreateUserForm/CreateUserForm.tsx CONFLICT (add/add): Merge conflict in src/ui/units/service-settings/components/CreateUserForm/CreateUserForm.tsx Auto-merging src/ui/utils/utils.ts CONFLICT (add/add): Merge conflict in src/ui/utils/utils.ts Auto-merging tests/page-objects/editor/EditorPage.ts CONFLICT (add/add): Merge conflict in tests/page-objects/editor/EditorPage.ts Auto-merging tests/suites/dash/widgets/renderCharts.test.ts CONFLICT (add/add): Merge conflict in tests/suites/dash/widgets/renderCharts.test.ts Auto-merging tests/suites/editor/actions/resetButton.test.ts CONFLICT (add/add): Merge conflict in tests/suites/editor/actions/resetButton.test.ts Auto-merging tests/suites/editor/common/initialLoad.test.ts CONFLICT (add/add): Merge conflict in tests/suites/editor/common/initialLoad.test.ts Auto-merging tests/suites/editor/errorProxy.test.ts CONFLICT (add/add): Merge conflict in tests/suites/editor/errorProxy.test.ts Auto-merging tests/suites/editor/templateExistance.test.ts CONFLICT (add/add): Merge conflict in tests/suites/editor/templateExistance.test.ts Auto-merging tests/suites/sql/common/loadChart.test.ts CONFLICT (add/add): Merge conflict in tests/suites/sql/common/loadChart.test.ts Auto-merging tests/suites/wizard/common/initialLoad.test.ts CONFLICT (add/add): Merge conflict in tests/suites/wizard/common/initialLoad.test.ts Auto-merging tests/utils/constants.ts CONFLICT (add/add): Merge conflict in tests/utils/constants.ts error: could not apply 32e1574b8... Next redesign iteration hint: Resolve all conflicts manually, mark them as resolved with hint: "git add/rm <conflicted_files>", then run "git rebase --continue". hint: You can instead skip this commit: run "git rebase --skip". hint: To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply 32e1574b8... Next redesign iteration (1) a month ago
robot-charts Repository rebase failed DataLens UI Opensource CHARTS-10604__1863 auth.dialog-change-password__1863	Rebasing (1/1) Auto-merging .github/workflows/i18n-check.yml CONFLICT (add/add): Merge conflict in .github/workflows/i18n-check.yml Auto-merging api/server/charts-engine.ts CONFLICT (add/add): Merge conflict in api/server/charts-engine.ts Auto-merging src/@types/nodekit.d.ts CONFLICT (add/add): Merge conflict in src/@types/nodekit.d.ts Auto-merging src/i18n-keysets/auth.form-controls/en.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/auth.form-controls/en.json Auto-merging src/i18n-keysets/auth.form-controls/ru.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/auth.form-controls/ru.json Auto-merging src/i18n-keysets/chartkit.menu/en.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/chartkit.menu/en.json Auto-merging src/i18n-keysets/chartkit.menu/ru.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/chartkit.menu/ru.json Auto-merging src/i18n-keysets/component.chartkit-alerts.view/en.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/component.chartkit-alerts.view/en.json Auto-merging src/i18n-keysets/component.chartkit-alerts.view/ru.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/component.chartkit-alerts.view/ru.json Auto-merging src/i18n-keysets/component.dialog-relations.view/en.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/component.dialog-relations.view/en.json Auto-merging src/i18n-keysets/component.dialog-relations.view/ru.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/component.dialog-relations.view/ru.json Auto-merging src/i18n-keysets/editor.templates.view/en.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/editor.templates.view/en.json Auto-merging src/i18n-keysets/editor.templates.view/ru.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/editor.templates.view/ru.json Auto-merging src/server/components/charts-engine/components/__tests__/mocks/chart-validator.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/__tests__/mocks/chart-validator.ts Auto-merging src/server/components/charts-engine/components/chart-generator.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/chart-generator.ts Auto-merging src/server/components/charts-engine/components/chart-validator.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/chart-validator.ts Auto-merging src/server/components/charts-engine/components/processor/chart-api-context.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/processor/chart-api-context.ts Auto-merging src/server/components/charts-engine/components/processor/index.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/processor/index.ts Auto-merging src/server/components/charts-engine/components/processor/types.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/processor/types.ts Auto-merging src/server/components/charts-engine/components/processor/utils.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/processor/utils.ts Auto-merging src/server/components/charts-engine/components/storage/types.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/storage/types.ts Auto-merging src/server/components/charts-engine/components/storage/united-storage/provider.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/storage/united-storage/provider.ts Auto-merging src/server/components/charts-engine/controllers/charts.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/controllers/charts.ts Auto-merging src/server/components/charts-engine/controllers/embeds.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/controllers/embeds.ts Auto-merging src/server/components/charts-engine/controllers/run.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/controllers/run.ts Auto-merging src/server/configs/opensource/common.ts CONFLICT (add/add): Merge conflict in src/server/configs/opensource/common.ts Auto-merging src/server/modes/charts/plugins/dataset/v2.ts CONFLICT (add/add): Merge conflict in src/server/modes/charts/plugins/dataset/v2.ts Auto-merging src/server/modes/opensource/routes.ts CONFLICT (add/add): Merge conflict in src/server/modes/opensource/routes.ts Auto-merging src/shared/constants/common.ts CONFLICT (add/add): Merge conflict in src/shared/constants/common.ts Auto-merging src/shared/constants/entry.ts CONFLICT (add/add): Merge conflict in src/shared/constants/entry.ts Auto-merging src/shared/constants/qa/editor.ts CONFLICT (add/add): Merge conflict in src/shared/constants/qa/editor.ts Auto-merging src/shared/modules/charts-shared.ts CONFLICT (add/add): Merge conflict in src/shared/modules/charts-shared.ts Auto-merging src/shared/modules/format-units/formatUnit.ts CONFLICT (add/add): Merge conflict in src/shared/modules/format-units/formatUnit.ts Auto-merging src/shared/schema/mix/actions/editor.ts CONFLICT (add/add): Merge conflict in src/shared/schema/mix/actions/editor.ts Auto-merging src/shared/types/charts.ts CONFLICT (add/add): Merge conflict in src/shared/types/charts.ts Auto-merging src/shared/types/feature.ts CONFLICT (add/add): Merge conflict in src/shared/types/feature.ts Auto-merging src/shared/types/widget.ts CONFLICT (add/add): Merge conflict in src/shared/types/widget.ts Auto-merging src/ui/components/CollectionsStructure/CreateEntryInWorkbookDialog.tsx CONFLICT (add/add): Merge conflict in src/ui/components/CollectionsStructure/CreateEntryInWorkbookDialog.tsx Auto-merging src/ui/components/DialogErrorWithTabs/DialogErrorWithTabs.scss CONFLICT (add/add): Merge conflict in src/ui/components/DialogErrorWithTabs/DialogErrorWithTabs.scss Auto-merging src/ui/components/DialogErrorWithTabs/Tabs/DebugTab/DebugTab.tsx CONFLICT (add/add): Merge conflict in src/ui/components/DialogErrorWithTabs/Tabs/DebugTab/DebugTab.tsx Auto-merging src/ui/components/DialogRelations/constants.ts CONFLICT (add/add): Merge conflict in src/ui/components/DialogRelations/constants.ts Auto-merging src/ui/components/EntityIcon/EntityIcon.scss CONFLICT (add/add): Merge conflict in src/ui/components/EntityIcon/EntityIcon.scss Auto-merging src/ui/components/EntityIcon/EntityIcon.tsx CONFLICT (add/add): Merge conflict in src/ui/components/EntityIcon/EntityIcon.tsx Auto-merging src/ui/components/EntryIcon/EntryIcon.tsx CONFLICT (add/add): Merge conflict in src/ui/components/EntryIcon/EntryIcon.tsx Auto-merging src/ui/components/Navigation/Core/CreateEntry/CreateEntry.tsx CONFLICT (add/add): Merge conflict in src/ui/components/Navigation/Core/CreateEntry/CreateEntry.tsx Auto-merging src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/utils/render.tsx CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/utils/render.tsx Auto-merging src/ui/libs/DatalensChartkit/ChartKit/helpers/chartkit-adapter.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/helpers/chartkit-adapter.ts Auto-merging src/ui/libs/DatalensChartkit/ChartKit/plugins/index.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/plugins/index.ts Auto-merging src/ui/libs/DatalensChartkit/ChartKit/types.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/types.ts Auto-merging src/ui/libs/DatalensChartkit/modules/data-provider/charts/index.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/data-provider/charts/index.ts Auto-merging src/ui/libs/DatalensChartkit/modules/data-provider/charts/node.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/data-provider/charts/node.ts Auto-merging src/ui/libs/DatalensChartkit/modules/data-provider/charts/types.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/data-provider/charts/types.ts Auto-merging src/ui/libs/DatalensChartkit/modules/data-provider/charts/ui-sandbox.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/data-provider/charts/ui-sandbox.ts Auto-merging src/ui/libs/DatalensChartkit/modules/data-provider/charts/utils.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/data-provider/charts/utils.ts Auto-merging src/ui/libs/DatalensChartkit/modules/html-generator/utils.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/html-generator/utils.ts Auto-merging src/ui/libs/DatalensChartkit/types/widget.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/types/widget.ts Auto-merging src/ui/registry/units/editor/components-map.tsx CONFLICT (add/add): Merge conflict in src/ui/registry/units/editor/components-map.tsx Auto-merging src/ui/registry/units/editor/constants/components.ts CONFLICT (add/add): Merge conflict in src/ui/registry/units/editor/constants/components.ts Auto-merging src/ui/registry/units/editor/register.tsx CONFLICT (add/add): Merge conflict in src/ui/registry/units/editor/register.tsx Auto-merging src/ui/units/auth/components/ChangePasswordDialog/ChangePasswordDialog.tsx CONFLICT (add/add): Merge conflict in src/ui/units/auth/components/ChangePasswordDialog/ChangePasswordDialog.tsx Auto-merging src/ui/units/auth/components/formControls/Password.tsx CONFLICT (add/add): Merge conflict in src/ui/units/auth/components/formControls/Password.tsx Auto-merging src/ui/units/connections/components/Page/components/CreateQlChartButton.tsx CONFLICT (add/add): Merge conflict in src/ui/units/connections/components/Page/components/CreateQlChartButton.tsx Auto-merging src/ui/units/dash/containers/Body/Body.scss CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Body/Body.scss Auto-merging src/ui/units/dash/containers/Body/Body.tsx CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Body/Body.tsx Auto-merging src/ui/units/dash/containers/Dialogs/utils.ts CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/utils.ts Auto-merging src/ui/units/dash/containers/FixedHeader/FixedHeader.scss CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/FixedHeader/FixedHeader.scss Auto-merging src/ui/units/dash/containers/FixedHeader/FixedHeader.tsx CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/FixedHeader/FixedHeader.tsx Auto-merging src/ui/units/dash/modules/constants.ts CONFLICT (add/add): Merge conflict in src/ui/units/dash/modules/constants.ts Auto-merging src/ui/units/editor/components/NewChart/NewChart.js CONFLICT (add/add): Merge conflict in src/ui/units/editor/components/NewChart/NewChart.js Auto-merging src/ui/units/editor/configs/chart/chart-editor-types.ts CONFLICT (add/add): Merge conflict in src/ui/units/editor/configs/chart/chart-editor-types.ts Auto-merging src/ui/units/editor/constants/common.ts CONFLICT (add/add): Merge conflict in src/ui/units/editor/constants/common.ts Auto-merging src/ui/units/editor/libs/monaco/types/types.js CONFLICT (add/add): Merge conflict in src/ui/units/editor/libs/monaco/types/types.js Auto-merging src/ui/units/editor/store/reducers/editor/editor.js CONFLICT (add/add): Merge conflict in src/ui/units/editor/store/reducers/editor/editor.js Auto-merging src/ui/units/editor/store/reducers/editor/editorTypedReducer.ts CONFLICT (add/add): Merge conflict in src/ui/units/editor/store/reducers/editor/editorTypedReducer.ts Auto-merging src/ui/units/editor/store/reducers/editor/helper.js CONFLICT (add/add): Merge conflict in src/ui/units/editor/store/reducers/editor/helper.js Auto-merging src/ui/units/editor/types/common.ts CONFLICT (add/add): Merge conflict in src/ui/units/editor/types/common.ts Auto-merging src/ui/units/service-settings/components/CreateUserForm/CreateUserForm.tsx CONFLICT (add/add): Merge conflict in src/ui/units/service-settings/components/CreateUserForm/CreateUserForm.tsx Auto-merging src/ui/utils/utils.ts CONFLICT (add/add): Merge conflict in src/ui/utils/utils.ts Auto-merging tests/page-objects/editor/EditorPage.ts CONFLICT (add/add): Merge conflict in tests/page-objects/editor/EditorPage.ts Auto-merging tests/suites/dash/widgets/renderCharts.test.ts CONFLICT (add/add): Merge conflict in tests/suites/dash/widgets/renderCharts.test.ts Auto-merging tests/suites/editor/actions/resetButton.test.ts CONFLICT (add/add): Merge conflict in tests/suites/editor/actions/resetButton.test.ts Auto-merging tests/suites/editor/common/initialLoad.test.ts CONFLICT (add/add): Merge conflict in tests/suites/editor/common/initialLoad.test.ts Auto-merging tests/suites/editor/errorProxy.test.ts CONFLICT (add/add): Merge conflict in tests/suites/editor/errorProxy.test.ts Auto-merging tests/suites/editor/templateExistance.test.ts CONFLICT (add/add): Merge conflict in tests/suites/editor/templateExistance.test.ts Auto-merging tests/suites/sql/common/loadChart.test.ts CONFLICT (add/add): Merge conflict in tests/suites/sql/common/loadChart.test.ts Auto-merging tests/suites/wizard/common/initialLoad.test.ts CONFLICT (add/add): Merge conflict in tests/suites/wizard/common/initialLoad.test.ts Auto-merging tests/utils/constants.ts CONFLICT (add/add): Merge conflict in tests/utils/constants.ts error: could not apply 32e1574b8... Next redesign iteration hint: Resolve all conflicts manually, mark them as resolved with hint: "git add/rm <conflicted_files>", then run "git rebase --continue". hint: You can instead skip this commit: run "git rebase --skip". hint: To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply 32e1574b8... Next redesign iteration (1) a month ago
robot-charts Repository rebase failed DataLens UI Opensource CHARTS-10604__1863 auth.dialog-change-password__1863	Rebasing (1/1) Auto-merging .github/workflows/i18n-check.yml CONFLICT (add/add): Merge conflict in .github/workflows/i18n-check.yml Auto-merging api/server/charts-engine.ts CONFLICT (add/add): Merge conflict in api/server/charts-engine.ts Auto-merging src/@types/nodekit.d.ts CONFLICT (add/add): Merge conflict in src/@types/nodekit.d.ts Auto-merging src/i18n-keysets/auth.form-controls/en.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/auth.form-controls/en.json Auto-merging src/i18n-keysets/auth.form-controls/ru.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/auth.form-controls/ru.json Auto-merging src/i18n-keysets/chartkit.menu/en.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/chartkit.menu/en.json Auto-merging src/i18n-keysets/chartkit.menu/ru.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/chartkit.menu/ru.json Auto-merging src/i18n-keysets/component.chartkit-alerts.view/en.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/component.chartkit-alerts.view/en.json Auto-merging src/i18n-keysets/component.chartkit-alerts.view/ru.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/component.chartkit-alerts.view/ru.json Auto-merging src/i18n-keysets/component.dialog-relations.view/en.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/component.dialog-relations.view/en.json Auto-merging src/i18n-keysets/component.dialog-relations.view/ru.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/component.dialog-relations.view/ru.json Auto-merging src/i18n-keysets/editor.templates.view/en.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/editor.templates.view/en.json Auto-merging src/i18n-keysets/editor.templates.view/ru.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/editor.templates.view/ru.json Auto-merging src/server/components/charts-engine/components/__tests__/mocks/chart-validator.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/__tests__/mocks/chart-validator.ts Auto-merging src/server/components/charts-engine/components/chart-generator.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/chart-generator.ts Auto-merging src/server/components/charts-engine/components/chart-validator.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/chart-validator.ts Auto-merging src/server/components/charts-engine/components/processor/chart-api-context.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/processor/chart-api-context.ts Auto-merging src/server/components/charts-engine/components/processor/index.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/processor/index.ts Auto-merging src/server/components/charts-engine/components/processor/types.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/processor/types.ts Auto-merging src/server/components/charts-engine/components/processor/utils.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/processor/utils.ts Auto-merging src/server/components/charts-engine/components/storage/types.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/storage/types.ts Auto-merging src/server/components/charts-engine/components/storage/united-storage/provider.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/storage/united-storage/provider.ts Auto-merging src/server/components/charts-engine/controllers/charts.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/controllers/charts.ts Auto-merging src/server/components/charts-engine/controllers/embeds.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/controllers/embeds.ts Auto-merging src/server/components/charts-engine/controllers/run.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/controllers/run.ts Auto-merging src/server/configs/opensource/common.ts CONFLICT (add/add): Merge conflict in src/server/configs/opensource/common.ts Auto-merging src/server/modes/charts/plugins/dataset/v2.ts CONFLICT (add/add): Merge conflict in src/server/modes/charts/plugins/dataset/v2.ts Auto-merging src/server/modes/opensource/routes.ts CONFLICT (add/add): Merge conflict in src/server/modes/opensource/routes.ts Auto-merging src/shared/constants/common.ts CONFLICT (add/add): Merge conflict in src/shared/constants/common.ts Auto-merging src/shared/constants/entry.ts CONFLICT (add/add): Merge conflict in src/shared/constants/entry.ts Auto-merging src/shared/constants/qa/editor.ts CONFLICT (add/add): Merge conflict in src/shared/constants/qa/editor.ts Auto-merging src/shared/modules/charts-shared.ts CONFLICT (add/add): Merge conflict in src/shared/modules/charts-shared.ts Auto-merging src/shared/modules/format-units/formatUnit.ts CONFLICT (add/add): Merge conflict in src/shared/modules/format-units/formatUnit.ts Auto-merging src/shared/schema/mix/actions/editor.ts CONFLICT (add/add): Merge conflict in src/shared/schema/mix/actions/editor.ts Auto-merging src/shared/types/charts.ts CONFLICT (add/add): Merge conflict in src/shared/types/charts.ts Auto-merging src/shared/types/feature.ts CONFLICT (add/add): Merge conflict in src/shared/types/feature.ts Auto-merging src/shared/types/widget.ts CONFLICT (add/add): Merge conflict in src/shared/types/widget.ts Auto-merging src/ui/components/CollectionsStructure/CreateEntryInWorkbookDialog.tsx CONFLICT (add/add): Merge conflict in src/ui/components/CollectionsStructure/CreateEntryInWorkbookDialog.tsx Auto-merging src/ui/components/DialogErrorWithTabs/DialogErrorWithTabs.scss CONFLICT (add/add): Merge conflict in src/ui/components/DialogErrorWithTabs/DialogErrorWithTabs.scss Auto-merging src/ui/components/DialogErrorWithTabs/Tabs/DebugTab/DebugTab.tsx CONFLICT (add/add): Merge conflict in src/ui/components/DialogErrorWithTabs/Tabs/DebugTab/DebugTab.tsx Auto-merging src/ui/components/DialogRelations/constants.ts CONFLICT (add/add): Merge conflict in src/ui/components/DialogRelations/constants.ts Auto-merging src/ui/components/EntityIcon/EntityIcon.scss CONFLICT (add/add): Merge conflict in src/ui/components/EntityIcon/EntityIcon.scss Auto-merging src/ui/components/EntityIcon/EntityIcon.tsx CONFLICT (add/add): Merge conflict in src/ui/components/EntityIcon/EntityIcon.tsx Auto-merging src/ui/components/EntryIcon/EntryIcon.tsx CONFLICT (add/add): Merge conflict in src/ui/components/EntryIcon/EntryIcon.tsx Auto-merging src/ui/components/Navigation/Core/CreateEntry/CreateEntry.tsx CONFLICT (add/add): Merge conflict in src/ui/components/Navigation/Core/CreateEntry/CreateEntry.tsx Auto-merging src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/utils/render.tsx CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/utils/render.tsx Auto-merging src/ui/libs/DatalensChartkit/ChartKit/helpers/chartkit-adapter.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/helpers/chartkit-adapter.ts Auto-merging src/ui/libs/DatalensChartkit/ChartKit/plugins/index.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/plugins/index.ts Auto-merging src/ui/libs/DatalensChartkit/ChartKit/types.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/types.ts Auto-merging src/ui/libs/DatalensChartkit/modules/data-provider/charts/index.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/data-provider/charts/index.ts Auto-merging src/ui/libs/DatalensChartkit/modules/data-provider/charts/node.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/data-provider/charts/node.ts Auto-merging src/ui/libs/DatalensChartkit/modules/data-provider/charts/types.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/data-provider/charts/types.ts Auto-merging src/ui/libs/DatalensChartkit/modules/data-provider/charts/ui-sandbox.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/data-provider/charts/ui-sandbox.ts Auto-merging src/ui/libs/DatalensChartkit/modules/data-provider/charts/utils.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/data-provider/charts/utils.ts Auto-merging src/ui/libs/DatalensChartkit/modules/html-generator/utils.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/html-generator/utils.ts Auto-merging src/ui/libs/DatalensChartkit/types/widget.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/types/widget.ts Auto-merging src/ui/registry/units/editor/components-map.tsx CONFLICT (add/add): Merge conflict in src/ui/registry/units/editor/components-map.tsx Auto-merging src/ui/registry/units/editor/constants/components.ts CONFLICT (add/add): Merge conflict in src/ui/registry/units/editor/constants/components.ts Auto-merging src/ui/registry/units/editor/register.tsx CONFLICT (add/add): Merge conflict in src/ui/registry/units/editor/register.tsx Auto-merging src/ui/units/auth/components/ChangePasswordDialog/ChangePasswordDialog.tsx CONFLICT (add/add): Merge conflict in src/ui/units/auth/components/ChangePasswordDialog/ChangePasswordDialog.tsx Auto-merging src/ui/units/auth/components/formControls/Password.tsx CONFLICT (add/add): Merge conflict in src/ui/units/auth/components/formControls/Password.tsx Auto-merging src/ui/units/connections/components/Page/components/CreateQlChartButton.tsx CONFLICT (add/add): Merge conflict in src/ui/units/connections/components/Page/components/CreateQlChartButton.tsx Auto-merging src/ui/units/dash/containers/Body/Body.scss CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Body/Body.scss Auto-merging src/ui/units/dash/containers/Body/Body.tsx CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Body/Body.tsx Auto-merging src/ui/units/dash/containers/Dialogs/utils.ts CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/utils.ts Auto-merging src/ui/units/dash/containers/FixedHeader/FixedHeader.scss CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/FixedHeader/FixedHeader.scss Auto-merging src/ui/units/dash/containers/FixedHeader/FixedHeader.tsx CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/FixedHeader/FixedHeader.tsx Auto-merging src/ui/units/dash/modules/constants.ts CONFLICT (add/add): Merge conflict in src/ui/units/dash/modules/constants.ts Auto-merging src/ui/units/editor/components/NewChart/NewChart.js CONFLICT (add/add): Merge conflict in src/ui/units/editor/components/NewChart/NewChart.js Auto-merging src/ui/units/editor/configs/chart/chart-editor-types.ts CONFLICT (add/add): Merge conflict in src/ui/units/editor/configs/chart/chart-editor-types.ts Auto-merging src/ui/units/editor/constants/common.ts CONFLICT (add/add): Merge conflict in src/ui/units/editor/constants/common.ts Auto-merging src/ui/units/editor/libs/monaco/types/types.js CONFLICT (add/add): Merge conflict in src/ui/units/editor/libs/monaco/types/types.js Auto-merging src/ui/units/editor/store/reducers/editor/editor.js CONFLICT (add/add): Merge conflict in src/ui/units/editor/store/reducers/editor/editor.js Auto-merging src/ui/units/editor/store/reducers/editor/editorTypedReducer.ts CONFLICT (add/add): Merge conflict in src/ui/units/editor/store/reducers/editor/editorTypedReducer.ts Auto-merging src/ui/units/editor/store/reducers/editor/helper.js CONFLICT (add/add): Merge conflict in src/ui/units/editor/store/reducers/editor/helper.js Auto-merging src/ui/units/editor/types/common.ts CONFLICT (add/add): Merge conflict in src/ui/units/editor/types/common.ts Auto-merging src/ui/units/service-settings/components/CreateUserForm/CreateUserForm.tsx CONFLICT (add/add): Merge conflict in src/ui/units/service-settings/components/CreateUserForm/CreateUserForm.tsx Auto-merging src/ui/utils/utils.ts CONFLICT (add/add): Merge conflict in src/ui/utils/utils.ts Auto-merging tests/page-objects/editor/EditorPage.ts CONFLICT (add/add): Merge conflict in tests/page-objects/editor/EditorPage.ts Auto-merging tests/suites/dash/widgets/renderCharts.test.ts CONFLICT (add/add): Merge conflict in tests/suites/dash/widgets/renderCharts.test.ts Auto-merging tests/suites/editor/actions/resetButton.test.ts CONFLICT (add/add): Merge conflict in tests/suites/editor/actions/resetButton.test.ts Auto-merging tests/suites/editor/common/initialLoad.test.ts CONFLICT (add/add): Merge conflict in tests/suites/editor/common/initialLoad.test.ts Auto-merging tests/suites/editor/errorProxy.test.ts CONFLICT (add/add): Merge conflict in tests/suites/editor/errorProxy.test.ts Auto-merging tests/suites/editor/templateExistance.test.ts CONFLICT (add/add): Merge conflict in tests/suites/editor/templateExistance.test.ts Auto-merging tests/suites/sql/common/loadChart.test.ts CONFLICT (add/add): Merge conflict in tests/suites/sql/common/loadChart.test.ts Auto-merging tests/suites/wizard/common/initialLoad.test.ts CONFLICT (add/add): Merge conflict in tests/suites/wizard/common/initialLoad.test.ts Auto-merging tests/utils/constants.ts CONFLICT (add/add): Merge conflict in tests/utils/constants.ts error: could not apply 32e1574b8... Next redesign iteration hint: Resolve all conflicts manually, mark them as resolved with hint: "git add/rm <conflicted_files>", then run "git rebase --continue". hint: You can instead skip this commit: run "git rebase --skip". hint: To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply 32e1574b8... Next redesign iteration (1) a month ago
robot-charts Repository rebase failed DataLens UI Opensource CHARTS-10604__1863 auth.dialog-change-password__1863	Rebasing (1/1) Auto-merging .github/workflows/i18n-check.yml CONFLICT (add/add): Merge conflict in .github/workflows/i18n-check.yml Auto-merging api/server/charts-engine.ts CONFLICT (add/add): Merge conflict in api/server/charts-engine.ts Auto-merging src/@types/nodekit.d.ts CONFLICT (add/add): Merge conflict in src/@types/nodekit.d.ts Auto-merging src/i18n-keysets/auth.form-controls/en.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/auth.form-controls/en.json Auto-merging src/i18n-keysets/auth.form-controls/ru.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/auth.form-controls/ru.json Auto-merging src/i18n-keysets/chartkit.menu/en.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/chartkit.menu/en.json Auto-merging src/i18n-keysets/chartkit.menu/ru.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/chartkit.menu/ru.json Auto-merging src/i18n-keysets/component.chartkit-alerts.view/en.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/component.chartkit-alerts.view/en.json Auto-merging src/i18n-keysets/component.chartkit-alerts.view/ru.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/component.chartkit-alerts.view/ru.json Auto-merging src/i18n-keysets/component.dialog-relations.view/en.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/component.dialog-relations.view/en.json Auto-merging src/i18n-keysets/component.dialog-relations.view/ru.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/component.dialog-relations.view/ru.json Auto-merging src/i18n-keysets/editor.templates.view/en.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/editor.templates.view/en.json Auto-merging src/i18n-keysets/editor.templates.view/ru.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/editor.templates.view/ru.json Auto-merging src/server/components/charts-engine/components/__tests__/mocks/chart-validator.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/__tests__/mocks/chart-validator.ts Auto-merging src/server/components/charts-engine/components/chart-generator.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/chart-generator.ts Auto-merging src/server/components/charts-engine/components/chart-validator.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/chart-validator.ts Auto-merging src/server/components/charts-engine/components/processor/chart-api-context.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/processor/chart-api-context.ts Auto-merging src/server/components/charts-engine/components/processor/index.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/processor/index.ts Auto-merging src/server/components/charts-engine/components/processor/types.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/processor/types.ts Auto-merging src/server/components/charts-engine/components/processor/utils.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/processor/utils.ts Auto-merging src/server/components/charts-engine/components/storage/types.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/storage/types.ts Auto-merging src/server/components/charts-engine/components/storage/united-storage/provider.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/storage/united-storage/provider.ts Auto-merging src/server/components/charts-engine/controllers/charts.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/controllers/charts.ts Auto-merging src/server/components/charts-engine/controllers/embeds.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/controllers/embeds.ts Auto-merging src/server/components/charts-engine/controllers/run.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/controllers/run.ts Auto-merging src/server/configs/opensource/common.ts CONFLICT (add/add): Merge conflict in src/server/configs/opensource/common.ts Auto-merging src/server/modes/charts/plugins/dataset/v2.ts CONFLICT (add/add): Merge conflict in src/server/modes/charts/plugins/dataset/v2.ts Auto-merging src/server/modes/opensource/routes.ts CONFLICT (add/add): Merge conflict in src/server/modes/opensource/routes.ts Auto-merging src/shared/constants/common.ts CONFLICT (add/add): Merge conflict in src/shared/constants/common.ts Auto-merging src/shared/constants/entry.ts CONFLICT (add/add): Merge conflict in src/shared/constants/entry.ts Auto-merging src/shared/constants/qa/editor.ts CONFLICT (add/add): Merge conflict in src/shared/constants/qa/editor.ts Auto-merging src/shared/modules/charts-shared.ts CONFLICT (add/add): Merge conflict in src/shared/modules/charts-shared.ts Auto-merging src/shared/modules/format-units/formatUnit.ts CONFLICT (add/add): Merge conflict in src/shared/modules/format-units/formatUnit.ts Auto-merging src/shared/schema/mix/actions/editor.ts CONFLICT (add/add): Merge conflict in src/shared/schema/mix/actions/editor.ts Auto-merging src/shared/types/charts.ts CONFLICT (add/add): Merge conflict in src/shared/types/charts.ts Auto-merging src/shared/types/feature.ts CONFLICT (add/add): Merge conflict in src/shared/types/feature.ts Auto-merging src/shared/types/widget.ts CONFLICT (add/add): Merge conflict in src/shared/types/widget.ts Auto-merging src/ui/components/CollectionsStructure/CreateEntryInWorkbookDialog.tsx CONFLICT (add/add): Merge conflict in src/ui/components/CollectionsStructure/CreateEntryInWorkbookDialog.tsx Auto-merging src/ui/components/DialogErrorWithTabs/DialogErrorWithTabs.scss CONFLICT (add/add): Merge conflict in src/ui/components/DialogErrorWithTabs/DialogErrorWithTabs.scss Auto-merging src/ui/components/DialogErrorWithTabs/Tabs/DebugTab/DebugTab.tsx CONFLICT (add/add): Merge conflict in src/ui/components/DialogErrorWithTabs/Tabs/DebugTab/DebugTab.tsx Auto-merging src/ui/components/DialogRelations/constants.ts CONFLICT (add/add): Merge conflict in src/ui/components/DialogRelations/constants.ts Auto-merging src/ui/components/EntityIcon/EntityIcon.scss CONFLICT (add/add): Merge conflict in src/ui/components/EntityIcon/EntityIcon.scss Auto-merging src/ui/components/EntityIcon/EntityIcon.tsx CONFLICT (add/add): Merge conflict in src/ui/components/EntityIcon/EntityIcon.tsx Auto-merging src/ui/components/EntryIcon/EntryIcon.tsx CONFLICT (add/add): Merge conflict in src/ui/components/EntryIcon/EntryIcon.tsx Auto-merging src/ui/components/Navigation/Core/CreateEntry/CreateEntry.tsx CONFLICT (add/add): Merge conflict in src/ui/components/Navigation/Core/CreateEntry/CreateEntry.tsx Auto-merging src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/utils/render.tsx CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/utils/render.tsx Auto-merging src/ui/libs/DatalensChartkit/ChartKit/helpers/chartkit-adapter.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/helpers/chartkit-adapter.ts Auto-merging src/ui/libs/DatalensChartkit/ChartKit/plugins/index.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/plugins/index.ts Auto-merging src/ui/libs/DatalensChartkit/ChartKit/types.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/types.ts Auto-merging src/ui/libs/DatalensChartkit/modules/data-provider/charts/index.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/data-provider/charts/index.ts Auto-merging src/ui/libs/DatalensChartkit/modules/data-provider/charts/node.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/data-provider/charts/node.ts Auto-merging src/ui/libs/DatalensChartkit/modules/data-provider/charts/types.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/data-provider/charts/types.ts Auto-merging src/ui/libs/DatalensChartkit/modules/data-provider/charts/ui-sandbox.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/data-provider/charts/ui-sandbox.ts Auto-merging src/ui/libs/DatalensChartkit/modules/data-provider/charts/utils.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/data-provider/charts/utils.ts Auto-merging src/ui/libs/DatalensChartkit/modules/html-generator/utils.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/html-generator/utils.ts Auto-merging src/ui/libs/DatalensChartkit/types/widget.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/types/widget.ts Auto-merging src/ui/registry/units/editor/components-map.tsx CONFLICT (add/add): Merge conflict in src/ui/registry/units/editor/components-map.tsx Auto-merging src/ui/registry/units/editor/constants/components.ts CONFLICT (add/add): Merge conflict in src/ui/registry/units/editor/constants/components.ts Auto-merging src/ui/registry/units/editor/register.tsx CONFLICT (add/add): Merge conflict in src/ui/registry/units/editor/register.tsx Auto-merging src/ui/units/auth/components/ChangePasswordDialog/ChangePasswordDialog.tsx CONFLICT (add/add): Merge conflict in src/ui/units/auth/components/ChangePasswordDialog/ChangePasswordDialog.tsx Auto-merging src/ui/units/auth/components/formControls/Password.tsx CONFLICT (add/add): Merge conflict in src/ui/units/auth/components/formControls/Password.tsx Auto-merging src/ui/units/connections/components/Page/components/CreateQlChartButton.tsx CONFLICT (add/add): Merge conflict in src/ui/units/connections/components/Page/components/CreateQlChartButton.tsx Auto-merging src/ui/units/dash/containers/Body/Body.scss CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Body/Body.scss Auto-merging src/ui/units/dash/containers/Body/Body.tsx CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Body/Body.tsx Auto-merging src/ui/units/dash/containers/Dialogs/utils.ts CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/utils.ts Auto-merging src/ui/units/dash/containers/FixedHeader/FixedHeader.scss CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/FixedHeader/FixedHeader.scss Auto-merging src/ui/units/dash/containers/FixedHeader/FixedHeader.tsx CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/FixedHeader/FixedHeader.tsx Auto-merging src/ui/units/dash/modules/constants.ts CONFLICT (add/add): Merge conflict in src/ui/units/dash/modules/constants.ts Auto-merging src/ui/units/editor/components/NewChart/NewChart.js CONFLICT (add/add): Merge conflict in src/ui/units/editor/components/NewChart/NewChart.js Auto-merging src/ui/units/editor/configs/chart/chart-editor-types.ts CONFLICT (add/add): Merge conflict in src/ui/units/editor/configs/chart/chart-editor-types.ts Auto-merging src/ui/units/editor/constants/common.ts CONFLICT (add/add): Merge conflict in src/ui/units/editor/constants/common.ts Auto-merging src/ui/units/editor/libs/monaco/types/types.js CONFLICT (add/add): Merge conflict in src/ui/units/editor/libs/monaco/types/types.js Auto-merging src/ui/units/editor/store/reducers/editor/editor.js CONFLICT (add/add): Merge conflict in src/ui/units/editor/store/reducers/editor/editor.js Auto-merging src/ui/units/editor/store/reducers/editor/editorTypedReducer.ts CONFLICT (add/add): Merge conflict in src/ui/units/editor/store/reducers/editor/editorTypedReducer.ts Auto-merging src/ui/units/editor/store/reducers/editor/helper.js CONFLICT (add/add): Merge conflict in src/ui/units/editor/store/reducers/editor/helper.js Auto-merging src/ui/units/editor/types/common.ts CONFLICT (add/add): Merge conflict in src/ui/units/editor/types/common.ts Auto-merging src/ui/units/service-settings/components/CreateUserForm/CreateUserForm.tsx CONFLICT (add/add): Merge conflict in src/ui/units/service-settings/components/CreateUserForm/CreateUserForm.tsx Auto-merging src/ui/utils/utils.ts CONFLICT (add/add): Merge conflict in src/ui/utils/utils.ts Auto-merging tests/page-objects/editor/EditorPage.ts CONFLICT (add/add): Merge conflict in tests/page-objects/editor/EditorPage.ts Auto-merging tests/suites/dash/widgets/renderCharts.test.ts CONFLICT (add/add): Merge conflict in tests/suites/dash/widgets/renderCharts.test.ts Auto-merging tests/suites/editor/actions/resetButton.test.ts CONFLICT (add/add): Merge conflict in tests/suites/editor/actions/resetButton.test.ts Auto-merging tests/suites/editor/common/initialLoad.test.ts CONFLICT (add/add): Merge conflict in tests/suites/editor/common/initialLoad.test.ts Auto-merging tests/suites/editor/errorProxy.test.ts CONFLICT (add/add): Merge conflict in tests/suites/editor/errorProxy.test.ts Auto-merging tests/suites/editor/templateExistance.test.ts CONFLICT (add/add): Merge conflict in tests/suites/editor/templateExistance.test.ts Auto-merging tests/suites/sql/common/loadChart.test.ts CONFLICT (add/add): Merge conflict in tests/suites/sql/common/loadChart.test.ts Auto-merging tests/suites/wizard/common/initialLoad.test.ts CONFLICT (add/add): Merge conflict in tests/suites/wizard/common/initialLoad.test.ts Auto-merging tests/utils/constants.ts CONFLICT (add/add): Merge conflict in tests/utils/constants.ts error: could not apply 32e1574b8... Next redesign iteration hint: Resolve all conflicts manually, mark them as resolved with hint: "git add/rm <conflicted_files>", then run "git rebase --continue". hint: You can instead skip this commit: run "git rebase --skip". hint: To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply 32e1574b8... Next redesign iteration (1) a month ago
robot-charts Repository rebase failed DataLens UI Opensource CHARTS-10604__1863 auth.dialog-change-password__1863	Rebasing (1/1) Auto-merging .github/workflows/i18n-check.yml CONFLICT (add/add): Merge conflict in .github/workflows/i18n-check.yml Auto-merging api/server/charts-engine.ts CONFLICT (add/add): Merge conflict in api/server/charts-engine.ts Auto-merging src/@types/nodekit.d.ts CONFLICT (add/add): Merge conflict in src/@types/nodekit.d.ts Auto-merging src/i18n-keysets/auth.form-controls/en.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/auth.form-controls/en.json Auto-merging src/i18n-keysets/auth.form-controls/ru.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/auth.form-controls/ru.json Auto-merging src/i18n-keysets/editor.templates.view/en.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/editor.templates.view/en.json Auto-merging src/i18n-keysets/editor.templates.view/ru.json CONFLICT (add/add): Merge conflict in src/i18n-keysets/editor.templates.view/ru.json Auto-merging src/server/components/charts-engine/components/__tests__/mocks/chart-validator.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/__tests__/mocks/chart-validator.ts Auto-merging src/server/components/charts-engine/components/chart-generator.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/chart-generator.ts Auto-merging src/server/components/charts-engine/components/chart-validator.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/chart-validator.ts Auto-merging src/server/components/charts-engine/components/processor/chart-api-context.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/processor/chart-api-context.ts Auto-merging src/server/components/charts-engine/components/processor/types.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/processor/types.ts Auto-merging src/server/components/charts-engine/components/storage/types.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/storage/types.ts Auto-merging src/server/components/charts-engine/components/storage/united-storage/provider.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/components/storage/united-storage/provider.ts Auto-merging src/server/components/charts-engine/controllers/embeds.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/controllers/embeds.ts Auto-merging src/server/components/charts-engine/controllers/run.ts CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/controllers/run.ts Auto-merging src/server/configs/opensource/common.ts CONFLICT (add/add): Merge conflict in src/server/configs/opensource/common.ts Auto-merging src/server/modes/charts/plugins/dataset/v2.ts CONFLICT (add/add): Merge conflict in src/server/modes/charts/plugins/dataset/v2.ts Auto-merging src/server/modes/opensource/routes.ts CONFLICT (add/add): Merge conflict in src/server/modes/opensource/routes.ts Auto-merging src/shared/constants/common.ts CONFLICT (add/add): Merge conflict in src/shared/constants/common.ts Auto-merging src/shared/constants/entry.ts CONFLICT (add/add): Merge conflict in src/shared/constants/entry.ts Auto-merging src/shared/constants/qa/editor.ts CONFLICT (add/add): Merge conflict in src/shared/constants/qa/editor.ts Auto-merging src/shared/modules/format-units/formatUnit.ts CONFLICT (add/add): Merge conflict in src/shared/modules/format-units/formatUnit.ts Auto-merging src/shared/types/charts.ts CONFLICT (add/add): Merge conflict in src/shared/types/charts.ts Auto-merging src/shared/types/feature.ts CONFLICT (add/add): Merge conflict in src/shared/types/feature.ts Auto-merging src/shared/types/widget.ts CONFLICT (add/add): Merge conflict in src/shared/types/widget.ts Auto-merging src/ui/components/CollectionsStructure/CreateEntryInWorkbookDialog.tsx CONFLICT (add/add): Merge conflict in src/ui/components/CollectionsStructure/CreateEntryInWorkbookDialog.tsx Auto-merging src/ui/components/DialogRelations/constants.ts CONFLICT (add/add): Merge conflict in src/ui/components/DialogRelations/constants.ts Auto-merging src/ui/components/EntityIcon/EntityIcon.scss CONFLICT (add/add): Merge conflict in src/ui/components/EntityIcon/EntityIcon.scss Auto-merging src/ui/components/EntityIcon/EntityIcon.tsx CONFLICT (add/add): Merge conflict in src/ui/components/EntityIcon/EntityIcon.tsx Auto-merging src/ui/components/EntryIcon/EntryIcon.tsx CONFLICT (add/add): Merge conflict in src/ui/components/EntryIcon/EntryIcon.tsx Auto-merging src/ui/components/Navigation/Core/CreateEntry/CreateEntry.tsx CONFLICT (add/add): Merge conflict in src/ui/components/Navigation/Core/CreateEntry/CreateEntry.tsx Auto-merging src/ui/libs/DatalensChartkit/ChartKit/helpers/chartkit-adapter.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/helpers/chartkit-adapter.ts Auto-merging src/ui/libs/DatalensChartkit/ChartKit/plugins/index.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/plugins/index.ts Auto-merging src/ui/libs/DatalensChartkit/ChartKit/types.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/types.ts Auto-merging src/ui/libs/DatalensChartkit/modules/data-provider/charts/index.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/data-provider/charts/index.ts Auto-merging src/ui/libs/DatalensChartkit/modules/data-provider/charts/node.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/data-provider/charts/node.ts Auto-merging src/ui/libs/DatalensChartkit/modules/data-provider/charts/types.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/data-provider/charts/types.ts Auto-merging src/ui/libs/DatalensChartkit/modules/data-provider/charts/ui-sandbox.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/data-provider/charts/ui-sandbox.ts Auto-merging src/ui/libs/DatalensChartkit/modules/data-provider/charts/utils.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/data-provider/charts/utils.ts Auto-merging src/ui/libs/DatalensChartkit/modules/html-generator/utils.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/html-generator/utils.ts Auto-merging src/ui/libs/DatalensChartkit/types/widget.ts CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/types/widget.ts Auto-merging src/ui/registry/units/editor/components-map.tsx CONFLICT (add/add): Merge conflict in src/ui/registry/units/editor/components-map.tsx Auto-merging src/ui/registry/units/editor/constants/components.ts CONFLICT (add/add): Merge conflict in src/ui/registry/units/editor/constants/components.ts Auto-merging src/ui/registry/units/editor/register.tsx CONFLICT (add/add): Merge conflict in src/ui/registry/units/editor/register.tsx Auto-merging src/ui/units/auth/components/ChangePasswordDialog/ChangePasswordDialog.tsx CONFLICT (add/add): Merge conflict in src/ui/units/auth/components/ChangePasswordDialog/ChangePasswordDialog.tsx Auto-merging src/ui/units/auth/components/formControls/Password.tsx CONFLICT (add/add): Merge conflict in src/ui/units/auth/components/formControls/Password.tsx Auto-merging src/ui/units/connections/components/Page/components/CreateQlChartButton.tsx CONFLICT (add/add): Merge conflict in src/ui/units/connections/components/Page/components/CreateQlChartButton.tsx Auto-merging src/ui/units/dash/containers/Body/Body.scss CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Body/Body.scss Auto-merging src/ui/units/dash/containers/Body/Body.tsx CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Body/Body.tsx Auto-merging src/ui/units/dash/containers/Dialogs/utils.ts CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/utils.ts Auto-merging src/ui/units/dash/containers/FixedHeader/FixedHeader.scss CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/FixedHeader/FixedHeader.scss Auto-merging src/ui/units/dash/containers/FixedHeader/FixedHeader.tsx CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/FixedHeader/FixedHeader.tsx Auto-merging src/ui/units/dash/modules/constants.ts CONFLICT (add/add): Merge conflict in src/ui/units/dash/modules/constants.ts Auto-merging src/ui/units/editor/components/NewChart/NewChart.js CONFLICT (add/add): Merge conflict in src/ui/units/editor/components/NewChart/NewChart.js Auto-merging src/ui/units/editor/configs/chart/chart-editor-types.ts CONFLICT (add/add): Merge conflict in src/ui/units/editor/configs/chart/chart-editor-types.ts Auto-merging src/ui/units/editor/constants/common.ts CONFLICT (add/add): Merge conflict in src/ui/units/editor/constants/common.ts Auto-merging src/ui/units/editor/libs/monaco/types/types.js CONFLICT (add/add): Merge conflict in src/ui/units/editor/libs/monaco/types/types.js Auto-merging src/ui/units/editor/store/reducers/editor/editor.js CONFLICT (add/add): Merge conflict in src/ui/units/editor/store/reducers/editor/editor.js Auto-merging src/ui/units/editor/store/reducers/editor/editorTypedReducer.ts CONFLICT (add/add): Merge conflict in src/ui/units/editor/store/reducers/editor/editorTypedReducer.ts Auto-merging src/ui/units/editor/store/reducers/editor/helper.js CONFLICT (add/add): Merge conflict in src/ui/units/editor/store/reducers/editor/helper.js Auto-merging src/ui/units/editor/types/common.ts CONFLICT (add/add): Merge conflict in src/ui/units/editor/types/common.ts Auto-merging src/ui/units/service-settings/components/CreateUserForm/CreateUserForm.tsx CONFLICT (add/add): Merge conflict in src/ui/units/service-settings/components/CreateUserForm/CreateUserForm.tsx Auto-merging src/ui/utils/utils.ts CONFLICT (add/add): Merge conflict in src/ui/utils/utils.ts Auto-merging tests/page-objects/editor/EditorPage.ts CONFLICT (add/add): Merge conflict in tests/page-objects/editor/EditorPage.ts Auto-merging tests/suites/dash/widgets/renderCharts.test.ts CONFLICT (add/add): Merge conflict in tests/suites/dash/widgets/renderCharts.test.ts Auto-merging tests/utils/constants.ts CONFLICT (add/add): Merge conflict in tests/utils/constants.ts error: could not apply 32e1574b8... Next redesign iteration hint: Resolve all conflicts manually, mark them as resolved with hint: "git add/rm <conflicted_files>", then run "git rebase --continue". hint: You can instead skip this commit: run "git rebase --skip". hint: To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply 32e1574b8... Next redesign iteration (1) a month ago

Browse all component changes