Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change transparent font settings #1823

Merged
merged 31 commits into from
Dec 9, 2024
Merged

Change transparent font settings #1823

merged 31 commits into from
Dec 9, 2024

Conversation

DaryaLari
Copy link
Contributor

No description provided.

@robot-charts
Copy link
Collaborator

i18n-check

The following components have not been translated

dash.palette-background (ru)
dash.palette-background (en)
datalens.landing.error (ru)
datalens.landing.error (en)
sql (ru)
sql (en)

Wait for the reviewers to check your changes in Weblate and try running github action again.

@robot-charts
Copy link
Collaborator

i18n-check

Errors occurred when merging changes from your branch with the Weblate branch. 
Rebasing (1/1)
Auto-merging .dockerignore
CONFLICT (add/add): Merge conflict in .dockerignore
Auto-merging .github/workflows/e2e_build_application_docker.yaml
CONFLICT (add/add): Merge conflict in .github/workflows/e2e_build_application_docker.yaml
Auto-merging .github/workflows/e2e_tests.yml
CONFLICT (add/add): Merge conflict in .github/workflows/e2e_tests.yml
Auto-merging .github/workflows/i18n-check.yml
CONFLICT (add/add): Merge conflict in .github/workflows/i18n-check.yml
Auto-merging .gitignore
CONFLICT (add/add): Merge conflict in .gitignore
Auto-merging api/ui/constants/common.ts
CONFLICT (add/add): Merge conflict in api/ui/constants/common.ts
Auto-merging package-lock.json
CONFLICT (add/add): Merge conflict in package-lock.json
Auto-merging package.json
CONFLICT (add/add): Merge conflict in package.json
Auto-merging scripts/e2e/playwright-docker.sh
CONFLICT (add/add): Merge conflict in scripts/e2e/playwright-docker.sh
Auto-merging scripts/e2e/us-dump.sh
CONFLICT (add/add): Merge conflict in scripts/e2e/us-dump.sh
Auto-merging src/i18n-keysets/component.entry-context-menu.view/en.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/component.entry-context-menu.view/en.json
Auto-merging src/i18n-keysets/component.entry-context-menu.view/ru.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/component.entry-context-menu.view/ru.json
Auto-merging src/i18n-keysets/datalens.landing.error/en.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/datalens.landing.error/en.json
Auto-merging src/i18n-keysets/datalens.landing.error/ru.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/datalens.landing.error/ru.json
Auto-merging src/i18n-keysets/sql/ru.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/sql/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/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/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/controllers/embeds.ts
CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/controllers/embeds.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/config/config.ts
CONFLICT (add/add): Merge conflict in src/server/modes/charts/plugins/datalens/config/config.ts
Auto-merging src/server/modes/charts/plugins/datalens/preparers/backend-pivot-table/table-rows-generator.ts
CONFLICT (add/add): Merge conflict in src/server/modes/charts/plugins/datalens/preparers/backend-pivot-table/table-rows-generator.ts
Auto-merging src/server/modes/charts/plugins/datalens/preparers/helpers/barsSettings/index.ts
CONFLICT (add/add): Merge conflict in src/server/modes/charts/plugins/datalens/preparers/helpers/barsSettings/index.ts
Auto-merging src/shared/constants/entry.ts
CONFLICT (add/add): Merge conflict in src/shared/constants/entry.ts
Auto-merging src/shared/constants/error-codes.ts
CONFLICT (add/add): Merge conflict in src/shared/constants/error-codes.ts
Auto-merging src/shared/constants/index.ts
CONFLICT (add/add): Merge conflict in src/shared/constants/index.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/schema/us/types/embeds.ts
CONFLICT (add/add): Merge conflict in src/shared/schema/us/types/embeds.ts
Auto-merging src/shared/types/charts.ts
CONFLICT (add/add): Merge conflict in src/shared/types/charts.ts
Auto-merging src/shared/types/common.ts
CONFLICT (add/add): Merge conflict in src/shared/types/common.ts
Auto-merging src/shared/types/config/wizard/v11.ts
CONFLICT (add/add): Merge conflict in src/shared/types/config/wizard/v11.ts
Auto-merging src/shared/types/dash.ts
CONFLICT (add/add): Merge conflict in src/shared/types/dash.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/shared/types/wizard/index.ts
CONFLICT (add/add): Merge conflict in src/shared/types/wizard/index.ts
Auto-merging src/ui/components/DashKit/plugins/GroupControl/Control/Control.tsx
CONFLICT (add/add): Merge conflict in src/ui/components/DashKit/plugins/GroupControl/Control/Control.tsx
Auto-merging src/ui/components/DashKit/plugins/GroupControl/GroupControl.scss
CONFLICT (add/add): Merge conflict in src/ui/components/DashKit/plugins/GroupControl/GroupControl.scss
Auto-merging src/ui/components/Widgets/Chart/ChartWidget.tsx
CONFLICT (add/add): Merge conflict in src/ui/components/Widgets/Chart/ChartWidget.tsx
Auto-merging src/ui/components/Widgets/Chart/components/Header.tsx
CONFLICT (add/add): Merge conflict in src/ui/components/Widgets/Chart/components/Header.tsx
Auto-merging src/ui/components/WorkbookNavigationMinimal/WorkbookNavigationMinimal.scss
CONFLICT (add/add): Merge conflict in src/ui/components/WorkbookNavigationMinimal/WorkbookNavigationMinimal.scss
Auto-merging src/ui/constants/common.ts
CONFLICT (add/add): Merge conflict in src/ui/constants/common.ts
Auto-merging src/ui/constants/dialogs.ts
CONFLICT (add/add): Merge conflict in src/ui/constants/dialogs.ts
Auto-merging src/ui/constants/mobile.ts
CONFLICT (add/add): Merge conflict in src/ui/constants/mobile.ts
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/Bar/Bar.scss
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/Bar/Bar.scss
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/Bar/Bar.tsx
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/Bar/Bar.tsx
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/Bar/utils.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/Bar/utils.ts
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/Table.scss
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/Table.scss
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/Table.tsx
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/Table.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/Table/renderer/TableWidget.scss
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/renderer/TableWidget.scss
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/renderer/components/Table/BackgroundTable.tsx
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/renderer/components/Table/BackgroundTable.tsx
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/renderer/components/Table/Table.scss
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/renderer/components/Table/Table.scss
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/renderer/components/Table/Table.tsx
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/renderer/components/Table/Table.tsx
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/components/ChartKitBase/components/Header/components/Menu/Items/DownloadCsv/DownloadCsv.tsx
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/components/ChartKitBase/components/Header/components/Menu/Items/DownloadCsv/DownloadCsv.tsx
Auto-merging src/ui/libs/DatalensChartkit/components/ChartKitBase/components/Header/components/Menu/Items/Export/Export.tsx
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/components/ChartKitBase/components/Header/components/Menu/Items/Export/Export.tsx
Auto-merging src/ui/libs/DatalensChartkit/components/ChartKitBase/components/Header/components/Menu/Items/Export/types.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/components/ChartKitBase/components/Header/components/Menu/Items/Export/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/wizard.js
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/data-provider/charts/wizard.js
Auto-merging src/ui/libs/DatalensChartkit/modules/export/export.js
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/export/export.js
Auto-merging src/ui/libs/DatalensChartkit/modules/html-generator/constants.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/html-generator/constants.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/chart/types/functions/getChartkitMenuByType.ts
CONFLICT (add/add): Merge conflict in src/ui/registry/units/chart/types/functions/getChartkitMenuByType.ts
Auto-merging src/ui/registry/units/common/components-map.tsx
CONFLICT (add/add): Merge conflict in src/ui/registry/units/common/components-map.tsx
Auto-merging src/ui/registry/units/common/functions-map.ts
CONFLICT (add/add): Merge conflict in src/ui/registry/units/common/functions-map.ts
Auto-merging src/ui/registry/units/common/register.tsx
CONFLICT (add/add): Merge conflict in src/ui/registry/units/common/register.tsx
Auto-merging src/ui/registry/units/dash/functions-map.ts
CONFLICT (add/add): Merge conflict in src/ui/registry/units/dash/functions-map.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/units/dash/components/DashActionPanel/DashActionPanelMobile.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/dash/components/DashActionPanel/DashActionPanelMobile.tsx
Auto-merging src/ui/units/dash/components/ParamsSettings/helpers.ts
CONFLICT (add/add): Merge conflict in src/ui/units/dash/components/ParamsSettings/helpers.ts
Auto-merging src/ui/units/dash/components/ParamsSettings/test/validateParamTitle.test.ts
CONFLICT (add/add): Merge conflict in src/ui/units/dash/components/ParamsSettings/test/validateParamTitle.test.ts
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/DialogEditQuery/DialogEditQuery.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/DialogEditQuery/DialogEditQuery.tsx
Auto-merging src/ui/units/dash/containers/Dialogs/Dialogs.js
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/Dialogs.js
Auto-merging src/ui/units/dash/containers/Dialogs/constants.ts
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/constants.ts
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/dash/store/actions/controls/actions.ts
CONFLICT (add/add): Merge conflict in src/ui/units/dash/store/actions/controls/actions.ts
Auto-merging src/ui/units/dash/store/actions/dashTyped.ts
CONFLICT (add/add): Merge conflict in src/ui/units/dash/store/actions/dashTyped.ts
Auto-merging src/ui/units/dash/store/actions/index.ts
CONFLICT (add/add): Merge conflict in src/ui/units/dash/store/actions/index.ts
Auto-merging src/ui/units/dash/store/reducers/dash.js
CONFLICT (add/add): Merge conflict in src/ui/units/dash/store/reducers/dash.js
Auto-merging src/ui/units/dash/store/reducers/dashTypedReducer.ts
CONFLICT (add/add): Merge conflict in src/ui/units/dash/store/reducers/dashTypedReducer.ts
Auto-merging src/ui/units/dash/store/selectors/dashTypedSelectors.ts
CONFLICT (add/add): Merge conflict in src/ui/units/dash/store/selectors/dashTypedSelectors.ts
Auto-merging src/ui/units/dash/store/utils.ts
CONFLICT (add/add): Merge conflict in src/ui/units/dash/store/utils.ts
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/wizard/actions/index.ts
CONFLICT (add/add): Merge conflict in src/ui/units/wizard/actions/index.ts
Auto-merging src/ui/units/wizard/actions/preview.ts
CONFLICT (add/add): Merge conflict in src/ui/units/wizard/actions/preview.ts
Auto-merging src/ui/units/wizard/components/DatasetSelect/DatasetSelectItem.scss
CONFLICT (add/add): Merge conflict in src/ui/units/wizard/components/DatasetSelect/DatasetSelectItem.scss
Auto-merging src/ui/units/wizard/components/Dialogs/DialogPointsSize.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/wizard/components/Dialogs/DialogPointsSize.tsx
Auto-merging src/ui/units/wizard/components/Dialogs/Settings/Settings.scss
CONFLICT (add/add): Merge conflict in src/ui/units/wizard/components/Dialogs/Settings/Settings.scss
Auto-merging src/ui/units/wizard/components/Dialogs/Settings/Settings.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/wizard/components/Dialogs/Settings/Settings.tsx
Auto-merging src/ui/units/wizard/containers/Wizard/SectionPreview/SectionPreview.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/wizard/containers/Wizard/SectionPreview/SectionPreview.tsx
Auto-merging src/ui/units/wizard/containers/Wizard/SectionVisualization/VisualizationSelector/VisualizationSelector.scss
CONFLICT (add/add): Merge conflict in src/ui/units/wizard/containers/Wizard/SectionVisualization/VisualizationSelector/VisualizationSelector.scss
Auto-merging tests/README.md
CONFLICT (add/add): Merge conflict in tests/README.md
Auto-merging tests/docker-compose.e2e.yml
CONFLICT (add/add): Merge conflict in tests/docker-compose.e2e.yml
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/charts/preview/widget-width.test.ts/Charts-Preview-Table-widget-must-be-the-same-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/charts/preview/widget-width.test.ts/Charts-Preview-Table-widget-must-be-the-same-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/charts/preview/widget-width.test.ts/Charts-Preview-Table-widget-must-be-the-same-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/dash/screenshots/baseWidgets.test.ts/Dashboards---Base-widgets-screenshots-Widgets-without-autoheight-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/dash/screenshots/baseWidgets.test.ts/Dashboards---Base-widgets-screenshots-Widgets-without-autoheight-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/dash/screenshots/baseWidgets.test.ts/Dashboards---Base-widgets-screenshots-Widgets-without-autoheight-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/dash/screenshots/mobile.test.ts/Dashboards---Mobile-screenshots-Custom-order-of-widgets-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/dash/screenshots/mobile.test.ts/Dashboards---Mobile-screenshots-Custom-order-of-widgets-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/dash/screenshots/mobile.test.ts/Dashboards---Mobile-screenshots-Custom-order-of-widgets-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/dash/screenshots/mobile.test.ts/Dashboards---Mobile-screenshots-Default-order-of-widgets-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/dash/screenshots/mobile.test.ts/Dashboards---Mobile-screenshots-Default-order-of-widgets-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/dash/screenshots/mobile.test.ts/Dashboards---Mobile-screenshots-Default-order-of-widgets-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/coloring.test.ts/Wizard-Flat-table-Gradient-coloring-for-null-values-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/coloring.test.ts/Wizard-Flat-table-Gradient-coloring-for-null-values-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/coloring.test.ts/Wizard-Flat-table-Gradient-coloring-for-null-values-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/coloring.test.ts/Wizard-Flat-table-Gradient-coloring-for-zero-values-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/coloring.test.ts/Wizard-Flat-table-Gradient-coloring-for-zero-values-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/coloring.test.ts/Wizard-Flat-table-Gradient-coloring-for-zero-values-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/coloring.test.ts/Wizard-Flat-table-Gradient-coloring-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/coloring.test.ts/Wizard-Flat-table-Gradient-coloring-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/coloring.test.ts/Wizard-Flat-table-Gradient-coloring-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/linear-indicator.test.ts/Wizard-Flat-table-Linear-indicator-with-column-background-color-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/linear-indicator.test.ts/Wizard-Flat-table-Linear-indicator-with-column-background-color-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/linear-indicator.test.ts/Wizard-Flat-table-Linear-indicator-with-column-background-color-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/linear-indicator.test.ts/Wizard-Flat-table-Linear-indicator-with-manual-aee01-ax-value-is-less-than-the-actual-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/linear-indicator.test.ts/Wizard-Flat-table-Linear-indicator-with-manual-aee01-ax-value-is-less-than-the-actual-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/linear-indicator.test.ts/Wizard-Flat-table-Linear-indicator-with-manual-aee01-ax-value-is-less-than-the-actual-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/pinned-columns.test.ts/Wizard-Flat-table-Pinned-columns-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/pinned-columns.test.ts/Wizard-Flat-table-Pinned-columns-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/pinned-columns.test.ts/Wizard-Flat-table-Pinned-columns-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/pinned-columns.test.ts/Wizard-Flat-table-Pinned-columns-screenshot-2.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/pinned-columns.test.ts/Wizard-Flat-table-Pinned-columns-screenshot-2.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/pinned-columns.test.ts/Wizard-Flat-table-Pinned-columns-screenshot-2.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/pinned-columns.test.ts/Wizard-Flat-table-Pinned-columns-screenshot-3.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/pinned-columns.test.ts/Wizard-Flat-table-Pinned-columns-screenshot-3.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/pinned-columns.test.ts/Wizard-Flat-table-Pinned-columns-screenshot-3.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-Correct-order-of-rows-when-scrolling-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-Correct-order-of-rows-when-scrolling-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-Correct-order-of-rows-when-scrolling-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-Correct-order-of-rows-when-scrolling-screenshot-2.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-Correct-order-of-rows-when-scrolling-screenshot-2.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-Correct-order-of-rows-when-scrolling-screenshot-2.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-Dynamic-column-width-during-row-virtualization-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-Dynamic-column-width-during-row-virtualization-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-Dynamic-column-width-during-row-virtualization-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-Dynamic-column-width-during-row-virtualization-screenshot-2.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-Dynamic-column-width-during-row-virtualization-screenshot-2.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-Dynamic-column-width-during-row-virtualization-screenshot-2.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-The-correct-placement-of-the-totals-row-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-The-correct-placement-of-the-totals-row-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-The-correct-placement-of-the-totals-row-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/coloring.test.ts/Wizard-Pivot-table-Coloring-zero-values-with-a-gradient-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/coloring.test.ts/Wizard-Pivot-table-Coloring-zero-values-with-a-gradient-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/coloring.test.ts/Wizard-Pivot-table-Coloring-zero-values-with-a-gradient-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/coloring.test.ts/Wizard-Pivot-table-Custom-palette-bar-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/coloring.test.ts/Wizard-Pivot-table-Custom-palette-bar-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/coloring.test.ts/Wizard-Pivot-table-Custom-palette-bar-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/coloring.test.ts/Wizard-Pivot-table-Two-colors-bar-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/coloring.test.ts/Wizard-Pivot-table-Two-colors-bar-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/coloring.test.ts/Wizard-Pivot-table-Two-colors-bar-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/coloring.test.ts/Wizard-Pivot-table-Two-colors-bar-screenshot-2.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/coloring.test.ts/Wizard-Pivot-table-Two-colors-bar-screenshot-2.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/coloring.test.ts/Wizard-Pivot-table-Two-colors-bar-screenshot-2.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/column-settings.test.ts/Wizard-Pivot-table-Columns-width-for-complex-three-level-header-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/column-settings.test.ts/Wizard-Pivot-table-Columns-width-for-complex-three-level-header-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/column-settings.test.ts/Wizard-Pivot-table-Columns-width-for-complex-three-level-header-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/formatting.test.ts/Wizard-Pivot-table-Null-values-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/formatting.test.ts/Wizard-Pivot-table-Null-values-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/formatting.test.ts/Wizard-Pivot-table-Null-values-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/header.test.ts/Wizard-Pivot-table-Complex-three-level-header-in-the-table-head-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/header.test.ts/Wizard-Pivot-table-Complex-three-level-header-in-the-table-head-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/header.test.ts/Wizard-Pivot-table-Complex-three-level-header-in-the-table-head-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/header.test.ts/Wizard-Pivot-table-Complex-three-level-header-in-the-table-rows-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/header.test.ts/Wizard-Pivot-table-Complex-three-level-header-in-the-table-rows-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/header.test.ts/Wizard-Pivot-table-Complex-three-level-header-in-the-table-rows-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/header.test.ts/Wizard-Pivot-table-Grouping-rows-with-markup-values-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/header.test.ts/Wizard-Pivot-table-Grouping-rows-with-markup-values-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/header.test.ts/Wizard-Pivot-table-Grouping-rows-with-markup-values-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/header.test.ts/Wizard-Pivot-table-Grouping-rows-with-the-same-value-in-the-previous-column-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/header.test.ts/Wizard-Pivot-table-Grouping-rows-with-the-same-value-in-the-previous-column-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/header.test.ts/Wizard-Pivot-table-Grouping-rows-with-the-same-value-in-the-previous-column-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/no-data.test.ts/Wizard-Pivot-table-No-data-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/no-data.test.ts/Wizard-Pivot-table-No-data-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/no-data.test.ts/Wizard-Pivot-table-No-data-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/pinned-columns.test.ts/Wizard-Pivot-table-Pinned-columns-with-subtotals-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/pinned-columns.test.ts/Wizard-Pivot-table-Pinned-columns-with-subtotals-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/pinned-columns.test.ts/Wizard-Pivot-table-Pinned-columns-with-subtotals-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/pinned-columns.test.ts/Wizard-Pivot-table-Pinned-columns-with-subtotals-screenshot-2.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/pinned-columns.test.ts/Wizard-Pivot-table-Pinned-columns-with-subtotals-screenshot-2.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/pinned-columns.test.ts/Wizard-Pivot-table-Pinned-columns-with-subtotals-screenshot-2.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/totals.test.ts/Wizard-Pivot-table-Subtotals-for-Rows-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/totals.test.ts/Wizard-Pivot-table-Subtotals-for-Rows-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/totals.test.ts/Wizard-Pivot-table-Subtotals-for-Rows-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/virtualization.test.ts/Wizard-Pivot-table-Correct-order-of-rows-when-scrolling-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/virtualization.test.ts/Wizard-Pivot-table-Correct-order-of-rows-when-scrolling-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/virtualization.test.ts/Wizard-Pivot-table-Correct-order-of-rows-when-scrolling-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/virtualization.test.ts/Wizard-Pivot-table-Correct-order-of-rows-when-scrolling-screenshot-2.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/virtualization.test.ts/Wizard-Pivot-table-Correct-order-of-rows-when-scrolling-screenshot-2.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/virtualization.test.ts/Wizard-Pivot-table-Correct-order-of-rows-when-scrolling-screenshot-2.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/virtualization.test.ts/Wizard-Pivot-table-Scroll-for-tables-with-row-grouping-and-fixed-column-width-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/virtualization.test.ts/Wizard-Pivot-table-Scroll-for-tables-with-row-grouping-and-fixed-column-width-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/virtualization.test.ts/Wizard-Pivot-table-Scroll-for-tables-with-row-grouping-and-fixed-column-width-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/virtualization.test.ts/Wizard-Pivot-table-The-correct-placement-of-the-totals-row-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/virtualization.test.ts/Wizard-Pivot-table-The-correct-placement-of-the-totals-row-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/virtualization.test.ts/Wizard-Pivot-table-The-correct-placement-of-the-totals-row-screenshot-1.png
Auto-merging tests/opensource-suites/dash/base/loading.test.ts
CONFLICT (add/add): Merge conflict in tests/opensource-suites/dash/base/loading.test.ts
Auto-merging tests/opensource-suites/wizard/visualizations/pivot-table/totals.test.ts
CONFLICT (add/add): Merge conflict in tests/opensource-suites/wizard/visualizations/pivot-table/totals.test.ts
Auto-merging tests/page-objects/workbook/Workbook.ts
CONFLICT (add/add): Merge conflict in tests/page-objects/workbook/Workbook.ts
Auto-merging tests/playwright.config.ts
CONFLICT (add/add): Merge conflict in tests/playwright.config.ts
Auto-merging tests/utils/index.ts
CONFLICT (add/add): Merge conflict in tests/utils/index.ts
error: could not apply 5be63df5... Change pransparrent font settings
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 5be63df5... Change pransparrent font settings
 (1)

Resolve conflicts according to instructions

  1. Switch to the current branch associated with this pull request.
git checkout CHARTS-10652
  1. Add Weblate as remote. And remove previous upstream with the same name:
git remote remove weblate 2> /dev/null
git remote add weblate https://weblate.gravity-ui.com/git/datalens/charts-10652-1823/chartkit-1823/
git -c http.sslVerify=false remote update weblate
  1. Merge Weblate changes:
git merge weblate/CHARTS-10652
  1. Resolve conflicts:
edit ...
git add ...
git commit
  1. Push changes to upstream repository, Weblate will fetch merge from there:
git push origin

@github-actions GitHub Actions
Copy link

github-actions bot commented Nov 19, 2024 •
edited
Loading

📦 Statoscope quick diff with main-branch:

⏱ Build time: -1.7 sec (-0.88%)

⚖️ Initial size: -0.42 kb (-0.01%)

🕵️ Validation errors: 0

Full Statoscope report could be found here ↗️

@robot-charts
Copy link
Collaborator

i18n-check

The following components have not been translated

dash.palette-background (ru)
dash.palette-background (en)

Wait for the reviewers to check your changes in Weblate and try running github action again.

@DaryaLari DaryaLari requested a review from Marginy605 November 19, 2024 13:51
@DaryaLari DaryaLari changed the title Change pransparrent font settings Change transparrent font settings Nov 19, 2024
@DaryaLari DaryaLari changed the title Change transparrent font settings Change transparent font settings Nov 19, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Nov 19, 2024 •
edited
Loading

E2E Report is ready.

@robot-charts
Copy link
Collaborator

i18n-check

The following components have not been translated

dash.palette-background (ru)
dash.palette-background (en)

Wait for the reviewers to check your changes in Weblate and try running github action again.

@robot-charts
Copy link
Collaborator

i18n-check

The following components have not been translated

dash.palette-background (ru)
dash.palette-background (en)

Wait for the reviewers to check your changes in Weblate and try running github action again.

@robot-charts
Copy link
Collaborator

i18n-check

Errors occurred when merging changes from your branch with the Weblate branch. 
warning: skipped previously applied commit 71b490ac
warning: skipped previously applied commit 7b3cc2c4
warning: skipped previously applied commit 0e17e398
hint: use --reapply-cherry-picks to include skipped commits
hint: Disable this message with "git config advice.skippedCherryPicks false"
Rebasing (1/1)
Auto-merging .dockerignore
CONFLICT (add/add): Merge conflict in .dockerignore
Auto-merging .github/workflows/e2e_build_application_docker.yaml
CONFLICT (add/add): Merge conflict in .github/workflows/e2e_build_application_docker.yaml
Auto-merging .github/workflows/e2e_tests.yml
CONFLICT (add/add): Merge conflict in .github/workflows/e2e_tests.yml
Auto-merging .github/workflows/i18n-check.yml
CONFLICT (add/add): Merge conflict in .github/workflows/i18n-check.yml
Auto-merging .gitignore
CONFLICT (add/add): Merge conflict in .gitignore
Auto-merging api/ui/constants/common.ts
CONFLICT (add/add): Merge conflict in api/ui/constants/common.ts
Auto-merging package-lock.json
CONFLICT (add/add): Merge conflict in package-lock.json
Auto-merging package.json
CONFLICT (add/add): Merge conflict in package.json
Auto-merging scripts/e2e/playwright-docker.sh
CONFLICT (add/add): Merge conflict in scripts/e2e/playwright-docker.sh
Auto-merging scripts/e2e/us-dump.sh
CONFLICT (add/add): Merge conflict in scripts/e2e/us-dump.sh
Auto-merging src/i18n-keysets/component.entry-context-menu.view/en.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/component.entry-context-menu.view/en.json
Auto-merging src/i18n-keysets/component.entry-context-menu.view/ru.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/component.entry-context-menu.view/ru.json
Auto-merging src/i18n-keysets/dash.dialogs-common.edit/en.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/dash.dialogs-common.edit/en.json
Auto-merging src/i18n-keysets/dash.dialogs-common.edit/ru.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/dash.dialogs-common.edit/ru.json
Auto-merging src/i18n-keysets/dash.title-dialog.edit/en.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/dash.title-dialog.edit/en.json
Auto-merging src/i18n-keysets/dash.title-dialog.edit/ru.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/dash.title-dialog.edit/ru.json
Auto-merging src/i18n-keysets/datalens.landing.error/en.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/datalens.landing.error/en.json
Auto-merging src/i18n-keysets/datalens.landing.error/ru.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/datalens.landing.error/ru.json
Auto-merging src/i18n-keysets/sql/en.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/sql/en.json
Auto-merging src/i18n-keysets/sql/ru.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/sql/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/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/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/controllers/embeds.ts
CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/controllers/embeds.ts
Auto-merging src/server/components/resolve-entry-by-link.ts
CONFLICT (add/add): Merge conflict in src/server/components/resolve-entry-by-link.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/config/config.ts
CONFLICT (add/add): Merge conflict in src/server/modes/charts/plugins/datalens/config/config.ts
Auto-merging src/server/modes/charts/plugins/datalens/highcharts/highcharts.ts
CONFLICT (add/add): Merge conflict in src/server/modes/charts/plugins/datalens/highcharts/highcharts.ts
Auto-merging src/server/modes/charts/plugins/datalens/preparers/backend-pivot-table/table-rows-generator.ts
CONFLICT (add/add): Merge conflict in src/server/modes/charts/plugins/datalens/preparers/backend-pivot-table/table-rows-generator.ts
Auto-merging src/server/modes/charts/plugins/datalens/preparers/bar-x/highcharts.ts
CONFLICT (add/add): Merge conflict in src/server/modes/charts/plugins/datalens/preparers/bar-x/highcharts.ts
Auto-merging src/server/modes/charts/plugins/datalens/preparers/bar-y/highcharts.ts
CONFLICT (add/add): Merge conflict in src/server/modes/charts/plugins/datalens/preparers/bar-y/highcharts.ts
Auto-merging src/server/modes/charts/plugins/datalens/preparers/helpers/barsSettings/index.ts
CONFLICT (add/add): Merge conflict in src/server/modes/charts/plugins/datalens/preparers/helpers/barsSettings/index.ts
Auto-merging src/server/modes/charts/plugins/datalens/preparers/line/highcharts.ts
CONFLICT (add/add): Merge conflict in src/server/modes/charts/plugins/datalens/preparers/line/highcharts.ts
Auto-merging src/server/modes/charts/plugins/ql/yagr.ts
CONFLICT (add/add): Merge conflict in src/server/modes/charts/plugins/ql/yagr.ts
Auto-merging src/shared/constants/entry.ts
CONFLICT (add/add): Merge conflict in src/shared/constants/entry.ts
Auto-merging src/shared/constants/error-codes.ts
CONFLICT (add/add): Merge conflict in src/shared/constants/error-codes.ts
Auto-merging src/shared/constants/index.ts
CONFLICT (add/add): Merge conflict in src/shared/constants/index.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/schema/us/types/embeds.ts
CONFLICT (add/add): Merge conflict in src/shared/schema/us/types/embeds.ts
Auto-merging src/shared/types/charts.ts
CONFLICT (add/add): Merge conflict in src/shared/types/charts.ts
Auto-merging src/shared/types/common.ts
CONFLICT (add/add): Merge conflict in src/shared/types/common.ts
Auto-merging src/shared/types/config/wizard/v11.ts
CONFLICT (add/add): Merge conflict in src/shared/types/config/wizard/v11.ts
Auto-merging src/shared/types/dash.ts
CONFLICT (add/add): Merge conflict in src/shared/types/dash.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/shared/types/wizard/index.ts
CONFLICT (add/add): Merge conflict in src/shared/types/wizard/index.ts
Auto-merging src/ui/components/DashKit/plugins/GroupControl/Control/Control.tsx
CONFLICT (add/add): Merge conflict in src/ui/components/DashKit/plugins/GroupControl/Control/Control.tsx
Auto-merging src/ui/components/DashKit/plugins/GroupControl/GroupControl.scss
CONFLICT (add/add): Merge conflict in src/ui/components/DashKit/plugins/GroupControl/GroupControl.scss
Auto-merging src/ui/components/DashKit/plugins/Image/Image.tsx
CONFLICT (add/add): Merge conflict in src/ui/components/DashKit/plugins/Image/Image.tsx
Auto-merging src/ui/components/DashKit/plugins/Text/Text.tsx
CONFLICT (add/add): Merge conflict in src/ui/components/DashKit/plugins/Text/Text.tsx
Auto-merging src/ui/components/DashKit/plugins/Title/Title.tsx
CONFLICT (add/add): Merge conflict in src/ui/components/DashKit/plugins/Title/Title.tsx
Auto-merging src/ui/components/DialogChartWidget/DialogChartWidget.scss
CONFLICT (add/add): Merge conflict in src/ui/components/DialogChartWidget/DialogChartWidget.scss
Auto-merging src/ui/components/DialogChartWidget/DialogChartWidget.tsx
CONFLICT (add/add): Merge conflict in src/ui/components/DialogChartWidget/DialogChartWidget.tsx
Auto-merging src/ui/components/DialogImageWidget/DialogImageWidget.tsx
CONFLICT (add/add): Merge conflict in src/ui/components/DialogImageWidget/DialogImageWidget.tsx
Auto-merging src/ui/components/DialogTextWidget/DialogTextWidget.scss
CONFLICT (add/add): Merge conflict in src/ui/components/DialogTextWidget/DialogTextWidget.scss
Auto-merging src/ui/components/DialogTextWidget/DialogTextWidget.tsx
CONFLICT (add/add): Merge conflict in src/ui/components/DialogTextWidget/DialogTextWidget.tsx
Auto-merging src/ui/components/DialogTitleWidget/DialogTitleWidget.scss
CONFLICT (add/add): Merge conflict in src/ui/components/DialogTitleWidget/DialogTitleWidget.scss
Auto-merging src/ui/components/DialogTitleWidget/DialogTitleWidget.tsx
CONFLICT (add/add): Merge conflict in src/ui/components/DialogTitleWidget/DialogTitleWidget.tsx
Auto-merging src/ui/components/TextEditor/TextEditor.tsx
CONFLICT (add/add): Merge conflict in src/ui/components/TextEditor/TextEditor.tsx
Auto-merging src/ui/components/Widgets/Chart/ChartWidget.tsx
CONFLICT (add/add): Merge conflict in src/ui/components/Widgets/Chart/ChartWidget.tsx
Auto-merging src/ui/components/Widgets/Chart/components/Content.tsx
CONFLICT (add/add): Merge conflict in src/ui/components/Widgets/Chart/components/Content.tsx
Auto-merging src/ui/components/Widgets/Chart/components/Header.tsx
CONFLICT (add/add): Merge conflict in src/ui/components/Widgets/Chart/components/Header.tsx
Auto-merging src/ui/components/Widgets/Chart/types.ts
CONFLICT (add/add): Merge conflict in src/ui/components/Widgets/Chart/types.ts
Auto-merging src/ui/components/WorkbookNavigationMinimal/WorkbookNavigationMinimal.scss
CONFLICT (add/add): Merge conflict in src/ui/components/WorkbookNavigationMinimal/WorkbookNavigationMinimal.scss
Auto-merging src/ui/constants/common.ts
CONFLICT (add/add): Merge conflict in src/ui/constants/common.ts
Auto-merging src/ui/constants/dialogs.ts
CONFLICT (add/add): Merge conflict in src/ui/constants/dialogs.ts
Auto-merging src/ui/constants/mobile.ts
CONFLICT (add/add): Merge conflict in src/ui/constants/mobile.ts
Auto-merging src/ui/constants/visualizations/index.ts
CONFLICT (add/add): Merge conflict in src/ui/constants/visualizations/index.ts
Auto-merging src/ui/index.ts
CONFLICT (add/add): Merge conflict in src/ui/index.ts
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/ChartKitAdapter.tsx
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/ChartKitAdapter.tsx
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/Bar/Bar.scss
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/Bar/Bar.scss
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/Bar/Bar.tsx
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/Bar/Bar.tsx
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/Bar/utils.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/Bar/utils.ts
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/Table.scss
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/Table.scss
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/Table.tsx
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/Table.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/Table/renderer/TableWidget.scss
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/renderer/TableWidget.scss
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/renderer/TableWidget.tsx
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/renderer/TableWidget.tsx
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/renderer/components/Table/BackgroundTable.tsx
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/renderer/components/Table/BackgroundTable.tsx
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/renderer/components/Table/Table.scss
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/renderer/components/Table/Table.scss
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/renderer/components/Table/Table.tsx
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/renderer/components/Table/Table.tsx
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/renderer/components/Table/TableBody.tsx
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/renderer/components/Table/TableBody.tsx
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/renderer/components/Table/usePreparedTableData.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/renderer/components/Table/usePreparedTableData.ts
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/renderer/components/Table/utils.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/renderer/components/Table/utils.ts
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/types.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/types.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/components/ChartKitBase/components/Chart/Chart.tsx
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/components/ChartKitBase/components/Chart/Chart.tsx
Auto-merging src/ui/libs/DatalensChartkit/components/ChartKitBase/components/Header/components/Menu/Items/DownloadCsv/DownloadCsv.tsx
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/components/ChartKitBase/components/Header/components/Menu/Items/DownloadCsv/DownloadCsv.tsx
Auto-merging src/ui/libs/DatalensChartkit/components/ChartKitBase/components/Header/components/Menu/Items/Export/Export.tsx
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/components/ChartKitBase/components/Header/components/Menu/Items/Export/Export.tsx
Auto-merging src/ui/libs/DatalensChartkit/components/ChartKitBase/components/Header/components/Menu/Items/Export/types.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/components/ChartKitBase/components/Header/components/Menu/Items/Export/types.ts
Auto-merging src/ui/libs/DatalensChartkit/components/Control/Items/Items.js
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/components/Control/Items/Items.js
Auto-merging src/ui/libs/DatalensChartkit/menu/MenuItems.tsx
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/menu/MenuItems.tsx
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/wizard.js
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/data-provider/charts/wizard.js
Auto-merging src/ui/libs/DatalensChartkit/modules/export/export.js
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/export/export.js
Auto-merging src/ui/libs/DatalensChartkit/modules/html-generator/constants.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/html-generator/constants.ts
Auto-merging src/ui/libs/DatalensChartkit/modules/menu/menu.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/menu/menu.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/chart/types/functions/getChartkitMenuByType.ts
CONFLICT (add/add): Merge conflict in src/ui/registry/units/chart/types/functions/getChartkitMenuByType.ts
Auto-merging src/ui/registry/units/common/components-map.tsx
CONFLICT (add/add): Merge conflict in src/ui/registry/units/common/components-map.tsx
Auto-merging src/ui/registry/units/common/functions-map.ts
CONFLICT (add/add): Merge conflict in src/ui/registry/units/common/functions-map.ts
Auto-merging src/ui/registry/units/common/register.tsx
CONFLICT (add/add): Merge conflict in src/ui/registry/units/common/register.tsx
Auto-merging src/ui/registry/units/dash/functions-map.ts
CONFLICT (add/add): Merge conflict in src/ui/registry/units/dash/functions-map.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/reducers/index.tsx
CONFLICT (add/add): Merge conflict in src/ui/store/reducers/index.tsx
Auto-merging src/ui/units/dash/components/DashActionPanel/DashActionPanelMobile.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/dash/components/DashActionPanel/DashActionPanelMobile.tsx
Auto-merging src/ui/units/dash/components/ParamsSettings/helpers.ts
CONFLICT (add/add): Merge conflict in src/ui/units/dash/components/ParamsSettings/helpers.ts
Auto-merging src/ui/units/dash/components/ParamsSettings/test/validateParamTitle.test.ts
CONFLICT (add/add): Merge conflict in src/ui/units/dash/components/ParamsSettings/test/validateParamTitle.test.ts
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/DialogEditQuery/DialogEditQuery.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/DialogEditQuery/DialogEditQuery.tsx
Auto-merging src/ui/units/dash/containers/Dialogs/Dialogs.js
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/Dialogs.js
Auto-merging src/ui/units/dash/containers/Dialogs/components/PaletteBackground/PaletteBackground.scss
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/components/PaletteBackground/PaletteBackground.scss
Auto-merging src/ui/units/dash/containers/Dialogs/components/PaletteBackground/PaletteBackground.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/components/PaletteBackground/PaletteBackground.tsx
Auto-merging src/ui/units/dash/containers/Dialogs/constants.ts
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/constants.ts
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/dash/modules/helpers.ts
CONFLICT (add/add): Merge conflict in src/ui/units/dash/modules/helpers.ts
Auto-merging src/ui/units/dash/store/actions/dashTyped.ts
CONFLICT (add/add): Merge conflict in src/ui/units/dash/store/actions/dashTyped.ts
Auto-merging src/ui/units/dash/store/actions/index.ts
CONFLICT (add/add): Merge conflict in src/ui/units/dash/store/actions/index.ts
Auto-merging src/ui/units/dash/store/reducers/dash.js
CONFLICT (add/add): Merge conflict in src/ui/units/dash/store/reducers/dash.js
Auto-merging src/ui/units/dash/store/reducers/dashTypedReducer.ts
CONFLICT (add/add): Merge conflict in src/ui/units/dash/store/reducers/dashTypedReducer.ts
Auto-merging src/ui/units/dash/store/selectors/dashTypedSelectors.ts
CONFLICT (add/add): Merge conflict in src/ui/units/dash/store/selectors/dashTypedSelectors.ts
Auto-merging src/ui/units/dash/store/utils.ts
CONFLICT (add/add): Merge conflict in src/ui/units/dash/store/utils.ts
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/wizard/actions/index.ts
CONFLICT (add/add): Merge conflict in src/ui/units/wizard/actions/index.ts
Auto-merging src/ui/units/wizard/actions/preview.ts
CONFLICT (add/add): Merge conflict in src/ui/units/wizard/actions/preview.ts
Auto-merging src/ui/units/wizard/components/DatasetSelect/DatasetSelectItem.scss
CONFLICT (add/add): Merge conflict in src/ui/units/wizard/components/DatasetSelect/DatasetSelectItem.scss
Auto-merging src/ui/units/wizard/components/Dialogs/DialogPointsSize.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/wizard/components/Dialogs/DialogPointsSize.tsx
Auto-merging src/ui/units/wizard/components/Dialogs/Settings/Settings.scss
CONFLICT (add/add): Merge conflict in src/ui/units/wizard/components/Dialogs/Settings/Settings.scss
Auto-merging src/ui/units/wizard/components/Dialogs/Settings/Settings.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/wizard/components/Dialogs/Settings/Settings.tsx
Auto-merging src/ui/units/wizard/containers/Wizard/SectionPreview/SectionPreview.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/wizard/containers/Wizard/SectionPreview/SectionPreview.tsx
Auto-merging src/ui/units/wizard/containers/Wizard/SectionVisualization/VisualizationSelector/VisualizationSelector.scss
CONFLICT (add/add): Merge conflict in src/ui/units/wizard/containers/Wizard/SectionVisualization/VisualizationSelector/VisualizationSelector.scss
Auto-merging src/ui/utils/getActionPanelItems.tsx
CONFLICT (add/add): Merge conflict in src/ui/utils/getActionPanelItems.tsx
Auto-merging tests/README.md
CONFLICT (add/add): Merge conflict in tests/README.md
Auto-merging tests/docker-compose.e2e.yml
CONFLICT (add/add): Merge conflict in tests/docker-compose.e2e.yml
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/charts/preview/widget-width.test.ts/Charts-Preview-Table-widget-must-be-the-same-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/charts/preview/widget-width.test.ts/Charts-Preview-Table-widget-must-be-the-same-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/charts/preview/widget-width.test.ts/Charts-Preview-Table-widget-must-be-the-same-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/dash/screenshots/baseWidgets.test.ts/Dashboards---Base-widgets-screenshots-Widgets-without-autoheight-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/dash/screenshots/baseWidgets.test.ts/Dashboards---Base-widgets-screenshots-Widgets-without-autoheight-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/dash/screenshots/baseWidgets.test.ts/Dashboards---Base-widgets-screenshots-Widgets-without-autoheight-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/dash/screenshots/mobile.test.ts/Dashboards---Mobile-screenshots-Custom-order-of-widgets-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/dash/screenshots/mobile.test.ts/Dashboards---Mobile-screenshots-Custom-order-of-widgets-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/dash/screenshots/mobile.test.ts/Dashboards---Mobile-screenshots-Custom-order-of-widgets-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/dash/screenshots/mobile.test.ts/Dashboards---Mobile-screenshots-Default-order-of-widgets-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/dash/screenshots/mobile.test.ts/Dashboards---Mobile-screenshots-Default-order-of-widgets-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/dash/screenshots/mobile.test.ts/Dashboards---Mobile-screenshots-Default-order-of-widgets-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/coloring.test.ts/Wizard-Flat-table-Gradient-coloring-for-null-values-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/coloring.test.ts/Wizard-Flat-table-Gradient-coloring-for-null-values-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/coloring.test.ts/Wizard-Flat-table-Gradient-coloring-for-null-values-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/coloring.test.ts/Wizard-Flat-table-Gradient-coloring-for-zero-values-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/coloring.test.ts/Wizard-Flat-table-Gradient-coloring-for-zero-values-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/coloring.test.ts/Wizard-Flat-table-Gradient-coloring-for-zero-values-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/coloring.test.ts/Wizard-Flat-table-Gradient-coloring-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/coloring.test.ts/Wizard-Flat-table-Gradient-coloring-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/coloring.test.ts/Wizard-Flat-table-Gradient-coloring-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/linear-indicator.test.ts/Wizard-Flat-table-Linear-indicator-with-column-background-color-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/linear-indicator.test.ts/Wizard-Flat-table-Linear-indicator-with-column-background-color-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/linear-indicator.test.ts/Wizard-Flat-table-Linear-indicator-with-column-background-color-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/linear-indicator.test.ts/Wizard-Flat-table-Linear-indicator-with-manual-aee01-ax-value-is-less-than-the-actual-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/linear-indicator.test.ts/Wizard-Flat-table-Linear-indicator-with-manual-aee01-ax-value-is-less-than-the-actual-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/linear-indicator.test.ts/Wizard-Flat-table-Linear-indicator-with-manual-aee01-ax-value-is-less-than-the-actual-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/pinned-columns.test.ts/Wizard-Flat-table-Pinned-columns-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/pinned-columns.test.ts/Wizard-Flat-table-Pinned-columns-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/pinned-columns.test.ts/Wizard-Flat-table-Pinned-columns-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/pinned-columns.test.ts/Wizard-Flat-table-Pinned-columns-screenshot-2.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/pinned-columns.test.ts/Wizard-Flat-table-Pinned-columns-screenshot-2.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/pinned-columns.test.ts/Wizard-Flat-table-Pinned-columns-screenshot-2.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/pinned-columns.test.ts/Wizard-Flat-table-Pinned-columns-screenshot-3.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/pinned-columns.test.ts/Wizard-Flat-table-Pinned-columns-screenshot-3.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/pinned-columns.test.ts/Wizard-Flat-table-Pinned-columns-screenshot-3.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-Correct-order-of-rows-when-scrolling-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-Correct-order-of-rows-when-scrolling-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-Correct-order-of-rows-when-scrolling-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-Correct-order-of-rows-when-scrolling-screenshot-2.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-Correct-order-of-rows-when-scrolling-screenshot-2.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-Correct-order-of-rows-when-scrolling-screenshot-2.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-Dynamic-column-width-during-row-virtualization-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-Dynamic-column-width-during-row-virtualization-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-Dynamic-column-width-during-row-virtualization-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-Dynamic-column-width-during-row-virtualization-screenshot-2.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-Dynamic-column-width-during-row-virtualization-screenshot-2.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-Dynamic-column-width-during-row-virtualization-screenshot-2.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-The-correct-placement-of-the-totals-row-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-The-correct-placement-of-the-totals-row-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-The-correct-placement-of-the-totals-row-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/coloring.test.ts/Wizard-Pivot-table-Coloring-zero-values-with-a-gradient-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/coloring.test.ts/Wizard-Pivot-table-Coloring-zero-values-with-a-gradient-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/coloring.test.ts/Wizard-Pivot-table-Coloring-zero-values-with-a-gradient-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/coloring.test.ts/Wizard-Pivot-table-Custom-palette-bar-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/coloring.test.ts/Wizard-Pivot-table-Custom-palette-bar-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/coloring.test.ts/Wizard-Pivot-table-Custom-palette-bar-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/coloring.test.ts/Wizard-Pivot-table-Two-colors-bar-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/coloring.test.ts/Wizard-Pivot-table-Two-colors-bar-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/coloring.test.ts/Wizard-Pivot-table-Two-colors-bar-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/coloring.test.ts/Wizard-Pivot-table-Two-colors-bar-screenshot-2.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/coloring.test.ts/Wizard-Pivot-table-Two-colors-bar-screenshot-2.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/coloring.test.ts/Wizard-Pivot-table-Two-colors-bar-screenshot-2.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/column-settings.test.ts/Wizard-Pivot-table-Columns-width-for-complex-three-level-header-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/column-settings.test.ts/Wizard-Pivot-table-Columns-width-for-complex-three-level-header-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/column-settings.test.ts/Wizard-Pivot-table-Columns-width-for-complex-three-level-header-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/formatting.test.ts/Wizard-Pivot-table-Null-values-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/formatting.test.ts/Wizard-Pivot-table-Null-values-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/formatting.test.ts/Wizard-Pivot-table-Null-values-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/header.test.ts/Wizard-Pivot-table-Complex-three-level-header-in-the-table-head-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/header.test.ts/Wizard-Pivot-table-Complex-three-level-header-in-the-table-head-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/header.test.ts/Wizard-Pivot-table-Complex-three-level-header-in-the-table-head-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/header.test.ts/Wizard-Pivot-table-Complex-three-level-header-in-the-table-rows-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/header.test.ts/Wizard-Pivot-table-Complex-three-level-header-in-the-table-rows-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/header.test.ts/Wizard-Pivot-table-Complex-three-level-header-in-the-table-rows-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/header.test.ts/Wizard-Pivot-table-Grouping-rows-with-markup-values-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/header.test.ts/Wizard-Pivot-table-Grouping-rows-with-markup-values-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/header.test.ts/Wizard-Pivot-table-Grouping-rows-with-markup-values-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/header.test.ts/Wizard-Pivot-table-Grouping-rows-with-the-same-value-in-the-previous-column-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/header.test.ts/Wizard-Pivot-table-Grouping-rows-with-the-same-value-in-the-previous-column-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/header.test.ts/Wizard-Pivot-table-Grouping-rows-with-the-same-value-in-the-previous-column-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/no-data.test.ts/Wizard-Pivot-table-No-data-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/no-data.test.ts/Wizard-Pivot-table-No-data-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/no-data.test.ts/Wizard-Pivot-table-No-data-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/pinned-columns.test.ts/Wizard-Pivot-table-Pinned-columns-with-subtotals-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/pinned-columns.test.ts/Wizard-Pivot-table-Pinned-columns-with-subtotals-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/pinned-columns.test.ts/Wizard-Pivot-table-Pinned-columns-with-subtotals-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/pinned-columns.test.ts/Wizard-Pivot-table-Pinned-columns-with-subtotals-screenshot-2.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/pinned-columns.test.ts/Wizard-Pivot-table-Pinned-columns-with-subtotals-screenshot-2.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/pinned-columns.test.ts/Wizard-Pivot-table-Pinned-columns-with-subtotals-screenshot-2.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/totals.test.ts/Wizard-Pivot-table-Subtotals-for-Rows-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/totals.test.ts/Wizard-Pivot-table-Subtotals-for-Rows-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/totals.test.ts/Wizard-Pivot-table-Subtotals-for-Rows-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/virtualization.test.ts/Wizard-Pivot-table-Correct-order-of-rows-when-scrolling-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/virtualization.test.ts/Wizard-Pivot-table-Correct-order-of-rows-when-scrolling-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/virtualization.test.ts/Wizard-Pivot-table-Correct-order-of-rows-when-scrolling-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/virtualization.test.ts/Wizard-Pivot-table-Correct-order-of-rows-when-scrolling-screenshot-2.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/virtualization.test.ts/Wizard-Pivot-table-Correct-order-of-rows-when-scrolling-screenshot-2.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/virtualization.test.ts/Wizard-Pivot-table-Correct-order-of-rows-when-scrolling-screenshot-2.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/virtualization.test.ts/Wizard-Pivot-table-Scroll-for-tables-with-row-grouping-and-fixed-column-width-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/virtualization.test.ts/Wizard-Pivot-table-Scroll-for-tables-with-row-grouping-and-fixed-column-width-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/virtualization.test.ts/Wizard-Pivot-table-Scroll-for-tables-with-row-grouping-and-fixed-column-width-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/virtualization.test.ts/Wizard-Pivot-table-The-correct-placement-of-the-totals-row-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/virtualization.test.ts/Wizard-Pivot-table-The-correct-placement-of-the-totals-row-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/virtualization.test.ts/Wizard-Pivot-table-The-correct-placement-of-the-totals-row-screenshot-1.png
Auto-merging tests/opensource-suites/dash/base/loading.test.ts
CONFLICT (add/add): Merge conflict in tests/opensource-suites/dash/base/loading.test.ts
Auto-merging tests/opensource-suites/wizard/visualizations/pivot-table/totals.test.ts
CONFLICT (add/add): Merge conflict in tests/opensource-suites/wizard/visualizations/pivot-table/totals.test.ts
Auto-merging tests/page-objects/workbook/Workbook.ts
CONFLICT (add/add): Merge conflict in tests/page-objects/workbook/Workbook.ts
Auto-merging tests/playwright.config.ts
CONFLICT (add/add): Merge conflict in tests/playwright.config.ts
Auto-merging tests/utils/index.ts
CONFLICT (add/add): Merge conflict in tests/utils/index.ts
error: could not apply 5be63df5... Change pransparrent font settings
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 5be63df5... Change pransparrent font settings
 (1)

Resolve conflicts according to instructions

  1. Switch to the current branch associated with this pull request.
git checkout CHARTS-10652
  1. Add Weblate as remote. And remove previous upstream with the same name:
git remote remove weblate 2> /dev/null
git remote add weblate https://weblate.gravity-ui.com/git/datalens/charts-10652-1823/chartkit-1823/
git -c http.sslVerify=false remote update weblate
  1. Merge Weblate changes:
git merge weblate/CHARTS-10652
  1. Resolve conflicts:
edit ...
git add ...
git commit
  1. Push changes to upstream repository, Weblate will fetch merge from there:
git push origin

@robot-charts
Copy link
Collaborator

i18n-check

Errors occurred when merging changes from your branch with the Weblate branch. 
warning: skipped previously applied commit 71b490ac
warning: skipped previously applied commit 7b3cc2c4
warning: skipped previously applied commit 0e17e398
hint: use --reapply-cherry-picks to include skipped commits
hint: Disable this message with "git config advice.skippedCherryPicks false"
Rebasing (1/1)
Auto-merging .dockerignore
CONFLICT (add/add): Merge conflict in .dockerignore
Auto-merging .github/workflows/e2e_build_application_docker.yaml
CONFLICT (add/add): Merge conflict in .github/workflows/e2e_build_application_docker.yaml
Auto-merging .github/workflows/e2e_tests.yml
CONFLICT (add/add): Merge conflict in .github/workflows/e2e_tests.yml
Auto-merging .github/workflows/i18n-check.yml
CONFLICT (add/add): Merge conflict in .github/workflows/i18n-check.yml
Auto-merging .gitignore
CONFLICT (add/add): Merge conflict in .gitignore
Auto-merging api/ui/constants/common.ts
CONFLICT (add/add): Merge conflict in api/ui/constants/common.ts
Auto-merging package-lock.json
CONFLICT (add/add): Merge conflict in package-lock.json
Auto-merging package.json
CONFLICT (add/add): Merge conflict in package.json
Auto-merging scripts/e2e/playwright-docker.sh
CONFLICT (add/add): Merge conflict in scripts/e2e/playwright-docker.sh
Auto-merging scripts/e2e/us-dump.sh
CONFLICT (add/add): Merge conflict in scripts/e2e/us-dump.sh
Auto-merging src/i18n-keysets/component.entry-context-menu.view/en.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/component.entry-context-menu.view/en.json
Auto-merging src/i18n-keysets/component.entry-context-menu.view/ru.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/component.entry-context-menu.view/ru.json
Auto-merging src/i18n-keysets/dash.dialogs-common.edit/en.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/dash.dialogs-common.edit/en.json
Auto-merging src/i18n-keysets/dash.dialogs-common.edit/ru.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/dash.dialogs-common.edit/ru.json
Auto-merging src/i18n-keysets/dash.title-dialog.edit/en.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/dash.title-dialog.edit/en.json
Auto-merging src/i18n-keysets/dash.title-dialog.edit/ru.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/dash.title-dialog.edit/ru.json
Auto-merging src/i18n-keysets/datalens.landing.error/en.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/datalens.landing.error/en.json
Auto-merging src/i18n-keysets/datalens.landing.error/ru.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/datalens.landing.error/ru.json
Auto-merging src/i18n-keysets/sql/en.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/sql/en.json
Auto-merging src/i18n-keysets/sql/ru.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/sql/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/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/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/controllers/embeds.ts
CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/controllers/embeds.ts
Auto-merging src/server/components/resolve-entry-by-link.ts
CONFLICT (add/add): Merge conflict in src/server/components/resolve-entry-by-link.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/config/config.ts
CONFLICT (add/add): Merge conflict in src/server/modes/charts/plugins/datalens/config/config.ts
Auto-merging src/server/modes/charts/plugins/datalens/highcharts/highcharts.ts
CONFLICT (add/add): Merge conflict in src/server/modes/charts/plugins/datalens/highcharts/highcharts.ts
Auto-merging src/server/modes/charts/plugins/datalens/preparers/backend-pivot-table/table-rows-generator.ts
CONFLICT (add/add): Merge conflict in src/server/modes/charts/plugins/datalens/preparers/backend-pivot-table/table-rows-generator.ts
Auto-merging src/server/modes/charts/plugins/datalens/preparers/bar-x/highcharts.ts
CONFLICT (add/add): Merge conflict in src/server/modes/charts/plugins/datalens/preparers/bar-x/highcharts.ts
Auto-merging src/server/modes/charts/plugins/datalens/preparers/bar-y/highcharts.ts
CONFLICT (add/add): Merge conflict in src/server/modes/charts/plugins/datalens/preparers/bar-y/highcharts.ts
Auto-merging src/server/modes/charts/plugins/datalens/preparers/helpers/barsSettings/index.ts
CONFLICT (add/add): Merge conflict in src/server/modes/charts/plugins/datalens/preparers/helpers/barsSettings/index.ts
Auto-merging src/server/modes/charts/plugins/datalens/preparers/line/highcharts.ts
CONFLICT (add/add): Merge conflict in src/server/modes/charts/plugins/datalens/preparers/line/highcharts.ts
Auto-merging src/server/modes/charts/plugins/ql/yagr.ts
CONFLICT (add/add): Merge conflict in src/server/modes/charts/plugins/ql/yagr.ts
Auto-merging src/shared/constants/entry.ts
CONFLICT (add/add): Merge conflict in src/shared/constants/entry.ts
Auto-merging src/shared/constants/error-codes.ts
CONFLICT (add/add): Merge conflict in src/shared/constants/error-codes.ts
Auto-merging src/shared/constants/index.ts
CONFLICT (add/add): Merge conflict in src/shared/constants/index.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/schema/us/types/embeds.ts
CONFLICT (add/add): Merge conflict in src/shared/schema/us/types/embeds.ts
Auto-merging src/shared/types/charts.ts
CONFLICT (add/add): Merge conflict in src/shared/types/charts.ts
Auto-merging src/shared/types/common.ts
CONFLICT (add/add): Merge conflict in src/shared/types/common.ts
Auto-merging src/shared/types/config/wizard/v11.ts
CONFLICT (add/add): Merge conflict in src/shared/types/config/wizard/v11.ts
Auto-merging src/shared/types/dash.ts
CONFLICT (add/add): Merge conflict in src/shared/types/dash.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/shared/types/wizard/index.ts
CONFLICT (add/add): Merge conflict in src/shared/types/wizard/index.ts
Auto-merging src/ui/components/DashKit/plugins/GroupControl/Control/Control.tsx
CONFLICT (add/add): Merge conflict in src/ui/components/DashKit/plugins/GroupControl/Control/Control.tsx
Auto-merging src/ui/components/DashKit/plugins/GroupControl/GroupControl.scss
CONFLICT (add/add): Merge conflict in src/ui/components/DashKit/plugins/GroupControl/GroupControl.scss
Auto-merging src/ui/components/DashKit/plugins/Image/Image.tsx
CONFLICT (add/add): Merge conflict in src/ui/components/DashKit/plugins/Image/Image.tsx
Auto-merging src/ui/components/DashKit/plugins/Text/Text.tsx
CONFLICT (add/add): Merge conflict in src/ui/components/DashKit/plugins/Text/Text.tsx
Auto-merging src/ui/components/DashKit/plugins/Title/Title.tsx
CONFLICT (add/add): Merge conflict in src/ui/components/DashKit/plugins/Title/Title.tsx
Auto-merging src/ui/components/DialogChartWidget/DialogChartWidget.scss
CONFLICT (add/add): Merge conflict in src/ui/components/DialogChartWidget/DialogChartWidget.scss
Auto-merging src/ui/components/DialogChartWidget/DialogChartWidget.tsx
CONFLICT (add/add): Merge conflict in src/ui/components/DialogChartWidget/DialogChartWidget.tsx
Auto-merging src/ui/components/DialogImageWidget/DialogImageWidget.tsx
CONFLICT (add/add): Merge conflict in src/ui/components/DialogImageWidget/DialogImageWidget.tsx
Auto-merging src/ui/components/DialogTextWidget/DialogTextWidget.scss
CONFLICT (add/add): Merge conflict in src/ui/components/DialogTextWidget/DialogTextWidget.scss
Auto-merging src/ui/components/DialogTextWidget/DialogTextWidget.tsx
CONFLICT (add/add): Merge conflict in src/ui/components/DialogTextWidget/DialogTextWidget.tsx
Auto-merging src/ui/components/DialogTitleWidget/DialogTitleWidget.scss
CONFLICT (add/add): Merge conflict in src/ui/components/DialogTitleWidget/DialogTitleWidget.scss
Auto-merging src/ui/components/DialogTitleWidget/DialogTitleWidget.tsx
CONFLICT (add/add): Merge conflict in src/ui/components/DialogTitleWidget/DialogTitleWidget.tsx
Auto-merging src/ui/components/TextEditor/TextEditor.tsx
CONFLICT (add/add): Merge conflict in src/ui/components/TextEditor/TextEditor.tsx
Auto-merging src/ui/components/Widgets/Chart/ChartWidget.tsx
CONFLICT (add/add): Merge conflict in src/ui/components/Widgets/Chart/ChartWidget.tsx
Auto-merging src/ui/components/Widgets/Chart/components/Content.tsx
CONFLICT (add/add): Merge conflict in src/ui/components/Widgets/Chart/components/Content.tsx
Auto-merging src/ui/components/Widgets/Chart/components/Header.tsx
CONFLICT (add/add): Merge conflict in src/ui/components/Widgets/Chart/components/Header.tsx
Auto-merging src/ui/components/Widgets/Chart/types.ts
CONFLICT (add/add): Merge conflict in src/ui/components/Widgets/Chart/types.ts
Auto-merging src/ui/components/WorkbookNavigationMinimal/WorkbookNavigationMinimal.scss
CONFLICT (add/add): Merge conflict in src/ui/components/WorkbookNavigationMinimal/WorkbookNavigationMinimal.scss
Auto-merging src/ui/constants/common.ts
CONFLICT (add/add): Merge conflict in src/ui/constants/common.ts
Auto-merging src/ui/constants/dialogs.ts
CONFLICT (add/add): Merge conflict in src/ui/constants/dialogs.ts
Auto-merging src/ui/constants/mobile.ts
CONFLICT (add/add): Merge conflict in src/ui/constants/mobile.ts
Auto-merging src/ui/constants/visualizations/index.ts
CONFLICT (add/add): Merge conflict in src/ui/constants/visualizations/index.ts
Auto-merging src/ui/index.ts
CONFLICT (add/add): Merge conflict in src/ui/index.ts
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/ChartKitAdapter.tsx
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/ChartKitAdapter.tsx
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/Bar/Bar.scss
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/Bar/Bar.scss
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/Bar/Bar.tsx
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/Bar/Bar.tsx
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/Bar/utils.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/Bar/utils.ts
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/Table.scss
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/Table.scss
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/Table.tsx
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/Table.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/Table/renderer/TableWidget.scss
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/renderer/TableWidget.scss
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/renderer/TableWidget.tsx
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/renderer/TableWidget.tsx
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/renderer/components/Table/BackgroundTable.tsx
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/renderer/components/Table/BackgroundTable.tsx
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/renderer/components/Table/Table.scss
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/renderer/components/Table/Table.scss
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/renderer/components/Table/Table.tsx
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/renderer/components/Table/Table.tsx
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/renderer/components/Table/TableBody.tsx
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/renderer/components/Table/TableBody.tsx
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/renderer/components/Table/usePreparedTableData.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/renderer/components/Table/usePreparedTableData.ts
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/renderer/components/Table/utils.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/renderer/components/Table/utils.ts
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/types.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/types.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/components/ChartKitBase/components/Chart/Chart.tsx
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/components/ChartKitBase/components/Chart/Chart.tsx
Auto-merging src/ui/libs/DatalensChartkit/components/ChartKitBase/components/Header/components/Menu/Items/DownloadCsv/DownloadCsv.tsx
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/components/ChartKitBase/components/Header/components/Menu/Items/DownloadCsv/DownloadCsv.tsx
Auto-merging src/ui/libs/DatalensChartkit/components/ChartKitBase/components/Header/components/Menu/Items/Export/Export.tsx
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/components/ChartKitBase/components/Header/components/Menu/Items/Export/Export.tsx
Auto-merging src/ui/libs/DatalensChartkit/components/ChartKitBase/components/Header/components/Menu/Items/Export/types.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/components/ChartKitBase/components/Header/components/Menu/Items/Export/types.ts
Auto-merging src/ui/libs/DatalensChartkit/components/Control/Items/Items.js
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/components/Control/Items/Items.js
Auto-merging src/ui/libs/DatalensChartkit/menu/MenuItems.tsx
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/menu/MenuItems.tsx
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/wizard.js
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/data-provider/charts/wizard.js
Auto-merging src/ui/libs/DatalensChartkit/modules/export/export.js
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/export/export.js
Auto-merging src/ui/libs/DatalensChartkit/modules/html-generator/constants.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/html-generator/constants.ts
Auto-merging src/ui/libs/DatalensChartkit/modules/menu/menu.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/menu/menu.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/chart/types/functions/getChartkitMenuByType.ts
CONFLICT (add/add): Merge conflict in src/ui/registry/units/chart/types/functions/getChartkitMenuByType.ts
Auto-merging src/ui/registry/units/common/components-map.tsx
CONFLICT (add/add): Merge conflict in src/ui/registry/units/common/components-map.tsx
Auto-merging src/ui/registry/units/common/functions-map.ts
CONFLICT (add/add): Merge conflict in src/ui/registry/units/common/functions-map.ts
Auto-merging src/ui/registry/units/common/register.tsx
CONFLICT (add/add): Merge conflict in src/ui/registry/units/common/register.tsx
Auto-merging src/ui/registry/units/dash/functions-map.ts
CONFLICT (add/add): Merge conflict in src/ui/registry/units/dash/functions-map.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/reducers/index.tsx
CONFLICT (add/add): Merge conflict in src/ui/store/reducers/index.tsx
Auto-merging src/ui/units/dash/components/DashActionPanel/DashActionPanelMobile.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/dash/components/DashActionPanel/DashActionPanelMobile.tsx
Auto-merging src/ui/units/dash/components/ParamsSettings/helpers.ts
CONFLICT (add/add): Merge conflict in src/ui/units/dash/components/ParamsSettings/helpers.ts
Auto-merging src/ui/units/dash/components/ParamsSettings/test/validateParamTitle.test.ts
CONFLICT (add/add): Merge conflict in src/ui/units/dash/components/ParamsSettings/test/validateParamTitle.test.ts
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/DialogEditQuery/DialogEditQuery.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/DialogEditQuery/DialogEditQuery.tsx
Auto-merging src/ui/units/dash/containers/Dialogs/Dialogs.js
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/Dialogs.js
Auto-merging src/ui/units/dash/containers/Dialogs/components/PaletteBackground/PaletteBackground.scss
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/components/PaletteBackground/PaletteBackground.scss
Auto-merging src/ui/units/dash/containers/Dialogs/components/PaletteBackground/PaletteBackground.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/components/PaletteBackground/PaletteBackground.tsx
Auto-merging src/ui/units/dash/containers/Dialogs/constants.ts
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/constants.ts
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/dash/modules/helpers.ts
CONFLICT (add/add): Merge conflict in src/ui/units/dash/modules/helpers.ts
Auto-merging src/ui/units/dash/store/actions/dashTyped.ts
CONFLICT (add/add): Merge conflict in src/ui/units/dash/store/actions/dashTyped.ts
Auto-merging src/ui/units/dash/store/actions/index.ts
CONFLICT (add/add): Merge conflict in src/ui/units/dash/store/actions/index.ts
Auto-merging src/ui/units/dash/store/reducers/dash.js
CONFLICT (add/add): Merge conflict in src/ui/units/dash/store/reducers/dash.js
Auto-merging src/ui/units/dash/store/reducers/dashTypedReducer.ts
CONFLICT (add/add): Merge conflict in src/ui/units/dash/store/reducers/dashTypedReducer.ts
Auto-merging src/ui/units/dash/store/selectors/dashTypedSelectors.ts
CONFLICT (add/add): Merge conflict in src/ui/units/dash/store/selectors/dashTypedSelectors.ts
Auto-merging src/ui/units/dash/store/utils.ts
CONFLICT (add/add): Merge conflict in src/ui/units/dash/store/utils.ts
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/wizard/actions/index.ts
CONFLICT (add/add): Merge conflict in src/ui/units/wizard/actions/index.ts
Auto-merging src/ui/units/wizard/actions/preview.ts
CONFLICT (add/add): Merge conflict in src/ui/units/wizard/actions/preview.ts
Auto-merging src/ui/units/wizard/components/DatasetSelect/DatasetSelectItem.scss
CONFLICT (add/add): Merge conflict in src/ui/units/wizard/components/DatasetSelect/DatasetSelectItem.scss
Auto-merging src/ui/units/wizard/components/Dialogs/DialogPointsSize.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/wizard/components/Dialogs/DialogPointsSize.tsx
Auto-merging src/ui/units/wizard/components/Dialogs/Settings/Settings.scss
CONFLICT (add/add): Merge conflict in src/ui/units/wizard/components/Dialogs/Settings/Settings.scss
Auto-merging src/ui/units/wizard/components/Dialogs/Settings/Settings.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/wizard/components/Dialogs/Settings/Settings.tsx
Auto-merging src/ui/units/wizard/containers/Wizard/SectionPreview/SectionPreview.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/wizard/containers/Wizard/SectionPreview/SectionPreview.tsx
Auto-merging src/ui/units/wizard/containers/Wizard/SectionVisualization/VisualizationSelector/VisualizationSelector.scss
CONFLICT (add/add): Merge conflict in src/ui/units/wizard/containers/Wizard/SectionVisualization/VisualizationSelector/VisualizationSelector.scss
Auto-merging src/ui/utils/getActionPanelItems.tsx
CONFLICT (add/add): Merge conflict in src/ui/utils/getActionPanelItems.tsx
Auto-merging tests/README.md
CONFLICT (add/add): Merge conflict in tests/README.md
Auto-merging tests/docker-compose.e2e.yml
CONFLICT (add/add): Merge conflict in tests/docker-compose.e2e.yml
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/charts/preview/widget-width.test.ts/Charts-Preview-Table-widget-must-be-the-same-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/charts/preview/widget-width.test.ts/Charts-Preview-Table-widget-must-be-the-same-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/charts/preview/widget-width.test.ts/Charts-Preview-Table-widget-must-be-the-same-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/dash/screenshots/baseWidgets.test.ts/Dashboards---Base-widgets-screenshots-Widgets-without-autoheight-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/dash/screenshots/baseWidgets.test.ts/Dashboards---Base-widgets-screenshots-Widgets-without-autoheight-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/dash/screenshots/baseWidgets.test.ts/Dashboards---Base-widgets-screenshots-Widgets-without-autoheight-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/dash/screenshots/mobile.test.ts/Dashboards---Mobile-screenshots-Custom-order-of-widgets-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/dash/screenshots/mobile.test.ts/Dashboards---Mobile-screenshots-Custom-order-of-widgets-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/dash/screenshots/mobile.test.ts/Dashboards---Mobile-screenshots-Custom-order-of-widgets-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/dash/screenshots/mobile.test.ts/Dashboards---Mobile-screenshots-Default-order-of-widgets-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/dash/screenshots/mobile.test.ts/Dashboards---Mobile-screenshots-Default-order-of-widgets-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/dash/screenshots/mobile.test.ts/Dashboards---Mobile-screenshots-Default-order-of-widgets-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/coloring.test.ts/Wizard-Flat-table-Gradient-coloring-for-null-values-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/coloring.test.ts/Wizard-Flat-table-Gradient-coloring-for-null-values-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/coloring.test.ts/Wizard-Flat-table-Gradient-coloring-for-null-values-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/coloring.test.ts/Wizard-Flat-table-Gradient-coloring-for-zero-values-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/coloring.test.ts/Wizard-Flat-table-Gradient-coloring-for-zero-values-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/coloring.test.ts/Wizard-Flat-table-Gradient-coloring-for-zero-values-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/coloring.test.ts/Wizard-Flat-table-Gradient-coloring-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/coloring.test.ts/Wizard-Flat-table-Gradient-coloring-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/coloring.test.ts/Wizard-Flat-table-Gradient-coloring-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/linear-indicator.test.ts/Wizard-Flat-table-Linear-indicator-with-column-background-color-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/linear-indicator.test.ts/Wizard-Flat-table-Linear-indicator-with-column-background-color-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/linear-indicator.test.ts/Wizard-Flat-table-Linear-indicator-with-column-background-color-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/linear-indicator.test.ts/Wizard-Flat-table-Linear-indicator-with-manual-aee01-ax-value-is-less-than-the-actual-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/linear-indicator.test.ts/Wizard-Flat-table-Linear-indicator-with-manual-aee01-ax-value-is-less-than-the-actual-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/linear-indicator.test.ts/Wizard-Flat-table-Linear-indicator-with-manual-aee01-ax-value-is-less-than-the-actual-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/pinned-columns.test.ts/Wizard-Flat-table-Pinned-columns-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/pinned-columns.test.ts/Wizard-Flat-table-Pinned-columns-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/pinned-columns.test.ts/Wizard-Flat-table-Pinned-columns-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/pinned-columns.test.ts/Wizard-Flat-table-Pinned-columns-screenshot-2.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/pinned-columns.test.ts/Wizard-Flat-table-Pinned-columns-screenshot-2.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/pinned-columns.test.ts/Wizard-Flat-table-Pinned-columns-screenshot-2.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/pinned-columns.test.ts/Wizard-Flat-table-Pinned-columns-screenshot-3.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/pinned-columns.test.ts/Wizard-Flat-table-Pinned-columns-screenshot-3.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/pinned-columns.test.ts/Wizard-Flat-table-Pinned-columns-screenshot-3.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-Correct-order-of-rows-when-scrolling-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-Correct-order-of-rows-when-scrolling-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-Correct-order-of-rows-when-scrolling-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-Correct-order-of-rows-when-scrolling-screenshot-2.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-Correct-order-of-rows-when-scrolling-screenshot-2.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-Correct-order-of-rows-when-scrolling-screenshot-2.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-Dynamic-column-width-during-row-virtualization-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-Dynamic-column-width-during-row-virtualization-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-Dynamic-column-width-during-row-virtualization-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-Dynamic-column-width-during-row-virtualization-screenshot-2.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-Dynamic-column-width-during-row-virtualization-screenshot-2.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-Dynamic-column-width-during-row-virtualization-screenshot-2.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-The-correct-placement-of-the-totals-row-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-The-correct-placement-of-the-totals-row-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-The-correct-placement-of-the-totals-row-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/coloring.test.ts/Wizard-Pivot-table-Coloring-zero-values-with-a-gradient-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/coloring.test.ts/Wizard-Pivot-table-Coloring-zero-values-with-a-gradient-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/coloring.test.ts/Wizard-Pivot-table-Coloring-zero-values-with-a-gradient-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/coloring.test.ts/Wizard-Pivot-table-Custom-palette-bar-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/coloring.test.ts/Wizard-Pivot-table-Custom-palette-bar-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/coloring.test.ts/Wizard-Pivot-table-Custom-palette-bar-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/coloring.test.ts/Wizard-Pivot-table-Two-colors-bar-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/coloring.test.ts/Wizard-Pivot-table-Two-colors-bar-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/coloring.test.ts/Wizard-Pivot-table-Two-colors-bar-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/coloring.test.ts/Wizard-Pivot-table-Two-colors-bar-screenshot-2.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/coloring.test.ts/Wizard-Pivot-table-Two-colors-bar-screenshot-2.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/coloring.test.ts/Wizard-Pivot-table-Two-colors-bar-screenshot-2.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/column-settings.test.ts/Wizard-Pivot-table-Columns-width-for-complex-three-level-header-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/column-settings.test.ts/Wizard-Pivot-table-Columns-width-for-complex-three-level-header-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/column-settings.test.ts/Wizard-Pivot-table-Columns-width-for-complex-three-level-header-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/formatting.test.ts/Wizard-Pivot-table-Null-values-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/formatting.test.ts/Wizard-Pivot-table-Null-values-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/formatting.test.ts/Wizard-Pivot-table-Null-values-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/header.test.ts/Wizard-Pivot-table-Complex-three-level-header-in-the-table-head-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/header.test.ts/Wizard-Pivot-table-Complex-three-level-header-in-the-table-head-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/header.test.ts/Wizard-Pivot-table-Complex-three-level-header-in-the-table-head-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/header.test.ts/Wizard-Pivot-table-Complex-three-level-header-in-the-table-rows-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/header.test.ts/Wizard-Pivot-table-Complex-three-level-header-in-the-table-rows-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/header.test.ts/Wizard-Pivot-table-Complex-three-level-header-in-the-table-rows-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/header.test.ts/Wizard-Pivot-table-Grouping-rows-with-markup-values-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/header.test.ts/Wizard-Pivot-table-Grouping-rows-with-markup-values-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/header.test.ts/Wizard-Pivot-table-Grouping-rows-with-markup-values-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/header.test.ts/Wizard-Pivot-table-Grouping-rows-with-the-same-value-in-the-previous-column-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/header.test.ts/Wizard-Pivot-table-Grouping-rows-with-the-same-value-in-the-previous-column-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/header.test.ts/Wizard-Pivot-table-Grouping-rows-with-the-same-value-in-the-previous-column-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/no-data.test.ts/Wizard-Pivot-table-No-data-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/no-data.test.ts/Wizard-Pivot-table-No-data-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/no-data.test.ts/Wizard-Pivot-table-No-data-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/pinned-columns.test.ts/Wizard-Pivot-table-Pinned-columns-with-subtotals-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/pinned-columns.test.ts/Wizard-Pivot-table-Pinned-columns-with-subtotals-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/pinned-columns.test.ts/Wizard-Pivot-table-Pinned-columns-with-subtotals-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/pinned-columns.test.ts/Wizard-Pivot-table-Pinned-columns-with-subtotals-screenshot-2.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/pinned-columns.test.ts/Wizard-Pivot-table-Pinned-columns-with-subtotals-screenshot-2.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/pinned-columns.test.ts/Wizard-Pivot-table-Pinned-columns-with-subtotals-screenshot-2.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/totals.test.ts/Wizard-Pivot-table-Subtotals-for-Rows-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/totals.test.ts/Wizard-Pivot-table-Subtotals-for-Rows-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/totals.test.ts/Wizard-Pivot-table-Subtotals-for-Rows-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/virtualization.test.ts/Wizard-Pivot-table-Correct-order-of-rows-when-scrolling-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/virtualization.test.ts/Wizard-Pivot-table-Correct-order-of-rows-when-scrolling-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/virtualization.test.ts/Wizard-Pivot-table-Correct-order-of-rows-when-scrolling-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/virtualization.test.ts/Wizard-Pivot-table-Correct-order-of-rows-when-scrolling-screenshot-2.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/virtualization.test.ts/Wizard-Pivot-table-Correct-order-of-rows-when-scrolling-screenshot-2.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/virtualization.test.ts/Wizard-Pivot-table-Correct-order-of-rows-when-scrolling-screenshot-2.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/virtualization.test.ts/Wizard-Pivot-table-Scroll-for-tables-with-row-grouping-and-fixed-column-width-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/virtualization.test.ts/Wizard-Pivot-table-Scroll-for-tables-with-row-grouping-and-fixed-column-width-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/virtualization.test.ts/Wizard-Pivot-table-Scroll-for-tables-with-row-grouping-and-fixed-column-width-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/virtualization.test.ts/Wizard-Pivot-table-The-correct-placement-of-the-totals-row-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/virtualization.test.ts/Wizard-Pivot-table-The-correct-placement-of-the-totals-row-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/virtualization.test.ts/Wizard-Pivot-table-The-correct-placement-of-the-totals-row-screenshot-1.png
Auto-merging tests/opensource-suites/dash/base/loading.test.ts
CONFLICT (add/add): Merge conflict in tests/opensource-suites/dash/base/loading.test.ts
Auto-merging tests/opensource-suites/wizard/visualizations/pivot-table/totals.test.ts
CONFLICT (add/add): Merge conflict in tests/opensource-suites/wizard/visualizations/pivot-table/totals.test.ts
Auto-merging tests/page-objects/workbook/Workbook.ts
CONFLICT (add/add): Merge conflict in tests/page-objects/workbook/Workbook.ts
Auto-merging tests/playwright.config.ts
CONFLICT (add/add): Merge conflict in tests/playwright.config.ts
Auto-merging tests/utils/index.ts
CONFLICT (add/add): Merge conflict in tests/utils/index.ts
error: could not apply 5be63df5... Change pransparrent font settings
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 5be63df5... Change pransparrent font settings
 (1)

Resolve conflicts according to instructions

  1. Switch to the current branch associated with this pull request.
git checkout CHARTS-10652
  1. Add Weblate as remote. And remove previous upstream with the same name:
git remote remove weblate 2> /dev/null
git remote add weblate https://weblate.gravity-ui.com/git/datalens/charts-10652-1823/chartkit-1823/
git -c http.sslVerify=false remote update weblate
  1. Merge Weblate changes:
git merge weblate/CHARTS-10652
  1. Resolve conflicts:
edit ...
git add ...
git commit
  1. Push changes to upstream repository, Weblate will fetch merge from there:
git push origin

@robot-charts
Copy link
Collaborator

i18n-check

Errors occurred when merging changes from your branch with the Weblate branch. 
warning: skipped previously applied commit 71b490ac
warning: skipped previously applied commit 7b3cc2c4
warning: skipped previously applied commit 0e17e398
hint: use --reapply-cherry-picks to include skipped commits
hint: Disable this message with "git config advice.skippedCherryPicks false"
Rebasing (1/1)
Auto-merging .dockerignore
CONFLICT (add/add): Merge conflict in .dockerignore
Auto-merging .github/workflows/build_application_docker.yaml
CONFLICT (add/add): Merge conflict in .github/workflows/build_application_docker.yaml
Auto-merging .github/workflows/e2e_build_application_docker.yaml
CONFLICT (add/add): Merge conflict in .github/workflows/e2e_build_application_docker.yaml
Auto-merging .github/workflows/e2e_tests.yml
CONFLICT (add/add): Merge conflict in .github/workflows/e2e_tests.yml
Auto-merging .github/workflows/e2e_tests_report.yml
CONFLICT (add/add): Merge conflict in .github/workflows/e2e_tests_report.yml
Auto-merging .github/workflows/i18n-check.yml
CONFLICT (add/add): Merge conflict in .github/workflows/i18n-check.yml
Auto-merging .github/workflows/statoscope_tests.yml
CONFLICT (add/add): Merge conflict in .github/workflows/statoscope_tests.yml
Auto-merging .github/workflows/statoscope_tests_report.yml
CONFLICT (add/add): Merge conflict in .github/workflows/statoscope_tests_report.yml
Auto-merging .gitignore
CONFLICT (add/add): Merge conflict in .gitignore
Auto-merging api/server/components.ts
CONFLICT (add/add): Merge conflict in api/server/components.ts
Auto-merging api/ui/constants/common.ts
CONFLICT (add/add): Merge conflict in api/ui/constants/common.ts
Auto-merging package-lock.json
CONFLICT (add/add): Merge conflict in package-lock.json
Auto-merging package.json
CONFLICT (add/add): Merge conflict in package.json
Auto-merging scripts/e2e/playwright-docker.sh
CONFLICT (add/add): Merge conflict in scripts/e2e/playwright-docker.sh
Auto-merging scripts/e2e/us-dump.sh
CONFLICT (add/add): Merge conflict in scripts/e2e/us-dump.sh
Auto-merging src/@types/nodekit.d.ts
CONFLICT (add/add): Merge conflict in src/@types/nodekit.d.ts
Auto-merging src/i18n-keysets/component.entry-context-menu.view/en.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/component.entry-context-menu.view/en.json
Auto-merging src/i18n-keysets/component.entry-context-menu.view/ru.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/component.entry-context-menu.view/ru.json
Auto-merging src/i18n-keysets/dash.dialogs-common.edit/en.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/dash.dialogs-common.edit/en.json
Auto-merging src/i18n-keysets/dash.dialogs-common.edit/ru.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/dash.dialogs-common.edit/ru.json
Auto-merging src/i18n-keysets/dash.title-dialog.edit/en.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/dash.title-dialog.edit/en.json
Auto-merging src/i18n-keysets/dash.title-dialog.edit/ru.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/dash.title-dialog.edit/ru.json
Auto-merging src/i18n-keysets/datalens.landing.error/en.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/datalens.landing.error/en.json
Auto-merging src/i18n-keysets/datalens.landing.error/ru.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/datalens.landing.error/ru.json
Auto-merging src/i18n-keysets/sql/en.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/sql/en.json
Auto-merging src/i18n-keysets/sql/ru.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/sql/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/cache-client.ts
CONFLICT (add/add): Merge conflict in src/server/components/cache-client.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/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/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/index.ts
CONFLICT (add/add): Merge conflict in src/server/components/charts-engine/index.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/components/index.ts
CONFLICT (add/add): Merge conflict in src/server/components/index.ts
Auto-merging src/server/components/resolve-entry-by-link.ts
CONFLICT (add/add): Merge conflict in src/server/components/resolve-entry-by-link.ts
Auto-merging src/server/configs/common.ts
CONFLICT (add/add): Merge conflict in src/server/configs/common.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/init-charts-engine.ts
CONFLICT (add/add): Merge conflict in src/server/modes/charts/init-charts-engine.ts
Auto-merging src/server/modes/charts/plugins/datalens/config/config.ts
CONFLICT (add/add): Merge conflict in src/server/modes/charts/plugins/datalens/config/config.ts
Auto-merging src/server/modes/charts/plugins/datalens/highcharts/highcharts.ts
CONFLICT (add/add): Merge conflict in src/server/modes/charts/plugins/datalens/highcharts/highcharts.ts
Auto-merging src/server/modes/charts/plugins/datalens/preparers/backend-pivot-table/table-rows-generator.ts
CONFLICT (add/add): Merge conflict in src/server/modes/charts/plugins/datalens/preparers/backend-pivot-table/table-rows-generator.ts
Auto-merging src/server/modes/charts/plugins/datalens/preparers/bar-x/highcharts.ts
CONFLICT (add/add): Merge conflict in src/server/modes/charts/plugins/datalens/preparers/bar-x/highcharts.ts
Auto-merging src/server/modes/charts/plugins/datalens/preparers/bar-y/highcharts.ts
CONFLICT (add/add): Merge conflict in src/server/modes/charts/plugins/datalens/preparers/bar-y/highcharts.ts
Auto-merging src/server/modes/charts/plugins/datalens/preparers/helpers/barsSettings/index.ts
CONFLICT (add/add): Merge conflict in src/server/modes/charts/plugins/datalens/preparers/helpers/barsSettings/index.ts
Auto-merging src/server/modes/charts/plugins/datalens/preparers/line/highcharts.ts
CONFLICT (add/add): Merge conflict in src/server/modes/charts/plugins/datalens/preparers/line/highcharts.ts
Auto-merging src/server/modes/charts/plugins/ql/yagr.ts
CONFLICT (add/add): Merge conflict in src/server/modes/charts/plugins/ql/yagr.ts
Auto-merging src/shared/constants/entry.ts
CONFLICT (add/add): Merge conflict in src/shared/constants/entry.ts
Auto-merging src/shared/constants/error-codes.ts
CONFLICT (add/add): Merge conflict in src/shared/constants/error-codes.ts
Auto-merging src/shared/constants/index.ts
CONFLICT (add/add): Merge conflict in src/shared/constants/index.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/schema/us/types/embeds.ts
CONFLICT (add/add): Merge conflict in src/shared/schema/us/types/embeds.ts
Auto-merging src/shared/types/charts.ts
CONFLICT (add/add): Merge conflict in src/shared/types/charts.ts
Auto-merging src/shared/types/common.ts
CONFLICT (add/add): Merge conflict in src/shared/types/common.ts
Auto-merging src/shared/types/config/wizard/v11.ts
CONFLICT (add/add): Merge conflict in src/shared/types/config/wizard/v11.ts
Auto-merging src/shared/types/dash.ts
CONFLICT (add/add): Merge conflict in src/shared/types/dash.ts
Auto-merging src/shared/types/feature.ts
CONFLICT (add/add): Merge conflict in src/shared/types/feature.ts
Auto-merging src/shared/types/utility-types.ts
CONFLICT (add/add): Merge conflict in src/shared/types/utility-types.ts
Auto-merging src/shared/types/widget.ts
CONFLICT (add/add): Merge conflict in src/shared/types/widget.ts
Auto-merging src/shared/types/wizard/index.ts
CONFLICT (add/add): Merge conflict in src/shared/types/wizard/index.ts
Auto-merging src/ui/components/DashKit/plugins/GroupControl/Control/Control.tsx
CONFLICT (add/add): Merge conflict in src/ui/components/DashKit/plugins/GroupControl/Control/Control.tsx
Auto-merging src/ui/components/DashKit/plugins/GroupControl/GroupControl.scss
CONFLICT (add/add): Merge conflict in src/ui/components/DashKit/plugins/GroupControl/GroupControl.scss
Auto-merging src/ui/components/DashKit/plugins/Image/Image.tsx
CONFLICT (add/add): Merge conflict in src/ui/components/DashKit/plugins/Image/Image.tsx
Auto-merging src/ui/components/DashKit/plugins/Text/Text.tsx
CONFLICT (add/add): Merge conflict in src/ui/components/DashKit/plugins/Text/Text.tsx
Auto-merging src/ui/components/DashKit/plugins/Title/Title.tsx
CONFLICT (add/add): Merge conflict in src/ui/components/DashKit/plugins/Title/Title.tsx
Auto-merging src/ui/components/DialogChartWidget/DialogChartWidget.scss
CONFLICT (add/add): Merge conflict in src/ui/components/DialogChartWidget/DialogChartWidget.scss
Auto-merging src/ui/components/DialogChartWidget/DialogChartWidget.tsx
CONFLICT (add/add): Merge conflict in src/ui/components/DialogChartWidget/DialogChartWidget.tsx
Auto-merging src/ui/components/DialogImageWidget/DialogImageWidget.tsx
CONFLICT (add/add): Merge conflict in src/ui/components/DialogImageWidget/DialogImageWidget.tsx
Auto-merging src/ui/components/DialogTextWidget/DialogTextWidget.scss
CONFLICT (add/add): Merge conflict in src/ui/components/DialogTextWidget/DialogTextWidget.scss
Auto-merging src/ui/components/DialogTextWidget/DialogTextWidget.tsx
CONFLICT (add/add): Merge conflict in src/ui/components/DialogTextWidget/DialogTextWidget.tsx
Auto-merging src/ui/components/DialogTitleWidget/DialogTitleWidget.scss
CONFLICT (add/add): Merge conflict in src/ui/components/DialogTitleWidget/DialogTitleWidget.scss
Auto-merging src/ui/components/DialogTitleWidget/DialogTitleWidget.tsx
CONFLICT (add/add): Merge conflict in src/ui/components/DialogTitleWidget/DialogTitleWidget.tsx
Auto-merging src/ui/components/TextEditor/TextEditor.tsx
CONFLICT (add/add): Merge conflict in src/ui/components/TextEditor/TextEditor.tsx
Auto-merging src/ui/components/Widgets/Chart/Chart.tsx
CONFLICT (add/add): Merge conflict in src/ui/components/Widgets/Chart/Chart.tsx
Auto-merging src/ui/components/Widgets/Chart/ChartWidget.tsx
CONFLICT (add/add): Merge conflict in src/ui/components/Widgets/Chart/ChartWidget.tsx
Auto-merging src/ui/components/Widgets/Chart/components/Content.tsx
CONFLICT (add/add): Merge conflict in src/ui/components/Widgets/Chart/components/Content.tsx
Auto-merging src/ui/components/Widgets/Chart/components/Header.tsx
CONFLICT (add/add): Merge conflict in src/ui/components/Widgets/Chart/components/Header.tsx
Auto-merging src/ui/components/Widgets/Chart/helpers/helpers.ts
CONFLICT (add/add): Merge conflict in src/ui/components/Widgets/Chart/helpers/helpers.ts
Auto-merging src/ui/components/Widgets/Chart/hooks/useLoadingChart.ts
CONFLICT (add/add): Merge conflict in src/ui/components/Widgets/Chart/hooks/useLoadingChart.ts
Auto-merging src/ui/components/Widgets/Chart/types.ts
CONFLICT (add/add): Merge conflict in src/ui/components/Widgets/Chart/types.ts
Auto-merging src/ui/components/WorkbookNavigationMinimal/WorkbookNavigationMinimal.scss
CONFLICT (add/add): Merge conflict in src/ui/components/WorkbookNavigationMinimal/WorkbookNavigationMinimal.scss
Auto-merging src/ui/constants/common.ts
CONFLICT (add/add): Merge conflict in src/ui/constants/common.ts
Auto-merging src/ui/constants/dialogs.ts
CONFLICT (add/add): Merge conflict in src/ui/constants/dialogs.ts
Auto-merging src/ui/constants/misc.ts
CONFLICT (add/add): Merge conflict in src/ui/constants/misc.ts
Auto-merging src/ui/constants/mobile.ts
CONFLICT (add/add): Merge conflict in src/ui/constants/mobile.ts
Auto-merging src/ui/constants/visualizations/index.ts
CONFLICT (add/add): Merge conflict in src/ui/constants/visualizations/index.ts
Auto-merging src/ui/hooks/useBindHotkey.ts
CONFLICT (add/add): Merge conflict in src/ui/hooks/useBindHotkey.ts
Auto-merging src/ui/index.ts
CONFLICT (add/add): Merge conflict in src/ui/index.ts
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/ChartKitAdapter.tsx
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/ChartKitAdapter.tsx
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/Bar/Bar.scss
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/Bar/Bar.scss
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/Bar/Bar.tsx
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/Bar/Bar.tsx
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/Bar/utils.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/Bar/utils.ts
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/Table.scss
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/Table.scss
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/Table.tsx
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/Table.tsx
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/utils/action-params.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/components/Widget/components/Table/utils/action-params.ts
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/helpers/action-params-handlers.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/helpers/action-params-handlers.ts
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/helpers/d3-event-handlers.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/helpers/d3-event-handlers.ts
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/renderer/TableWidget.scss
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/renderer/TableWidget.scss
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/renderer/TableWidget.tsx
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/renderer/TableWidget.tsx
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/renderer/components/Table/BackgroundTable.tsx
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/renderer/components/Table/BackgroundTable.tsx
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/renderer/components/Table/Table.scss
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/renderer/components/Table/Table.scss
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/renderer/components/Table/Table.tsx
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/renderer/components/Table/Table.tsx
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/renderer/components/Table/TableBody.tsx
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/renderer/components/Table/TableBody.tsx
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/renderer/components/Table/usePreparedTableData.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/renderer/components/Table/usePreparedTableData.ts
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/renderer/components/Table/utils.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/renderer/components/Table/utils.ts
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/types.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/plugins/Table/types.ts
Auto-merging src/ui/libs/DatalensChartkit/ChartKit/plugins/YandexMap/renderer/events.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/ChartKit/plugins/YandexMap/renderer/events.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/components/ChartKitBase/components/Chart/Chart.tsx
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/components/ChartKitBase/components/Chart/Chart.tsx
Auto-merging src/ui/libs/DatalensChartkit/components/ChartKitBase/components/Header/components/Menu/Items/DownloadCsv/DownloadCsv.tsx
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/components/ChartKitBase/components/Header/components/Menu/Items/DownloadCsv/DownloadCsv.tsx
Auto-merging src/ui/libs/DatalensChartkit/components/ChartKitBase/components/Header/components/Menu/Items/Export/Export.tsx
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/components/ChartKitBase/components/Header/components/Menu/Items/Export/Export.tsx
Auto-merging src/ui/libs/DatalensChartkit/components/ChartKitBase/components/Header/components/Menu/Items/Export/types.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/components/ChartKitBase/components/Header/components/Menu/Items/Export/types.ts
Auto-merging src/ui/libs/DatalensChartkit/components/Control/Control.tsx
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/components/Control/Control.tsx
Auto-merging src/ui/libs/DatalensChartkit/components/Control/Items/Items.js
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/components/Control/Items/Items.js
Auto-merging src/ui/libs/DatalensChartkit/components/Control/types.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/components/Control/types.ts
Auto-merging src/ui/libs/DatalensChartkit/menu/MenuItems.tsx
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/menu/MenuItems.tsx
Auto-merging src/ui/libs/DatalensChartkit/modules/constants/constants.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/constants/constants.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/data-provider/charts/wizard.js
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/data-provider/charts/wizard.js
Auto-merging src/ui/libs/DatalensChartkit/modules/export/export.js
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/export/export.js
Auto-merging src/ui/libs/DatalensChartkit/modules/html-generator/constants.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/html-generator/constants.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/modules/menu/menu.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/modules/menu/menu.ts
Auto-merging src/ui/libs/DatalensChartkit/types/control.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/types/control.ts
Auto-merging src/ui/libs/DatalensChartkit/types/dataProvider.ts
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/types/dataProvider.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/chart/types/functions/getChartkitMenuByType.ts
CONFLICT (add/add): Merge conflict in src/ui/registry/units/chart/types/functions/getChartkitMenuByType.ts
Auto-merging src/ui/registry/units/common/components-map.tsx
CONFLICT (add/add): Merge conflict in src/ui/registry/units/common/components-map.tsx
Auto-merging src/ui/registry/units/common/functions-map.ts
CONFLICT (add/add): Merge conflict in src/ui/registry/units/common/functions-map.ts
Auto-merging src/ui/registry/units/common/register.tsx
CONFLICT (add/add): Merge conflict in src/ui/registry/units/common/register.tsx
Auto-merging src/ui/registry/units/dash/functions-map.ts
CONFLICT (add/add): Merge conflict in src/ui/registry/units/dash/functions-map.ts
Auto-merging src/ui/store/actions/editHistory.ts
CONFLICT (add/add): Merge conflict in src/ui/store/actions/editHistory.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/configure.ts
CONFLICT (add/add): Merge conflict in src/ui/store/configure.ts
Auto-merging src/ui/store/reducers/editHistory.ts
CONFLICT (add/add): Merge conflict in src/ui/store/reducers/editHistory.ts
Auto-merging src/ui/store/reducers/index.tsx
CONFLICT (add/add): Merge conflict in src/ui/store/reducers/index.tsx
Auto-merging src/ui/units/dash/components/DashActionPanel/DashActionPanelMobile.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/dash/components/DashActionPanel/DashActionPanelMobile.tsx
Auto-merging src/ui/units/dash/components/ParamsSettings/helpers.ts
CONFLICT (add/add): Merge conflict in src/ui/units/dash/components/ParamsSettings/helpers.ts
Auto-merging src/ui/units/dash/components/ParamsSettings/test/validateParamTitle.test.ts
CONFLICT (add/add): Merge conflict in src/ui/units/dash/components/ParamsSettings/test/validateParamTitle.test.ts
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/DialogEditQuery/DialogEditQuery.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/DialogEditQuery/DialogEditQuery.tsx
Auto-merging src/ui/units/dash/containers/Dialogs/Dialogs.js
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/Dialogs.js
Auto-merging src/ui/units/dash/containers/Dialogs/components/PaletteBackground/PaletteBackground.scss
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/components/PaletteBackground/PaletteBackground.scss
Auto-merging src/ui/units/dash/containers/Dialogs/components/PaletteBackground/PaletteBackground.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/components/PaletteBackground/PaletteBackground.tsx
Auto-merging src/ui/units/dash/containers/Dialogs/constants.ts
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/constants.ts
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/dash/modules/helpers.ts
CONFLICT (add/add): Merge conflict in src/ui/units/dash/modules/helpers.ts
Auto-merging src/ui/units/dash/store/actions/dashTyped.ts
CONFLICT (add/add): Merge conflict in src/ui/units/dash/store/actions/dashTyped.ts
Auto-merging src/ui/units/dash/store/actions/index.ts
CONFLICT (add/add): Merge conflict in src/ui/units/dash/store/actions/index.ts
Auto-merging src/ui/units/dash/store/reducers/dash.js
CONFLICT (add/add): Merge conflict in src/ui/units/dash/store/reducers/dash.js
Auto-merging src/ui/units/dash/store/reducers/dashTypedReducer.ts
CONFLICT (add/add): Merge conflict in src/ui/units/dash/store/reducers/dashTypedReducer.ts
Auto-merging src/ui/units/dash/store/selectors/dashTypedSelectors.ts
CONFLICT (add/add): Merge conflict in src/ui/units/dash/store/selectors/dashTypedSelectors.ts
Auto-merging src/ui/units/dash/store/utils.ts
CONFLICT (add/add): Merge conflict in src/ui/units/dash/store/utils.ts
Auto-merging src/ui/units/datasets/components/DatasetPanel/DatasetPanel.scss
CONFLICT (add/add): Merge conflict in src/ui/units/datasets/components/DatasetPanel/DatasetPanel.scss
Auto-merging src/ui/units/datasets/components/DatasetTable/DatasetTable.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/datasets/components/DatasetTable/DatasetTable.tsx
Auto-merging src/ui/units/datasets/constants/index.ts
CONFLICT (add/add): Merge conflict in src/ui/units/datasets/constants/index.ts
Auto-merging src/ui/units/datasets/containers/Dataset/Dataset.js
CONFLICT (add/add): Merge conflict in src/ui/units/datasets/containers/Dataset/Dataset.js
Auto-merging src/ui/units/datasets/containers/Dataset/Dataset.scss
CONFLICT (add/add): Merge conflict in src/ui/units/datasets/containers/Dataset/Dataset.scss
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/containers/DatasetSources/DatasetSources.js
CONFLICT (add/add): Merge conflict in src/ui/units/datasets/containers/DatasetSources/DatasetSources.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/actions/creators/datasetTyped.ts
CONFLICT (add/add): Merge conflict in src/ui/units/datasets/store/actions/creators/datasetTyped.ts
Auto-merging src/ui/units/datasets/store/actions/types/dataset.ts
CONFLICT (add/add): Merge conflict in src/ui/units/datasets/store/actions/types/dataset.ts
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/types/dataset.ts
CONFLICT (add/add): Merge conflict in src/ui/units/datasets/store/types/dataset.ts
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/wizard/actions/index.ts
CONFLICT (add/add): Merge conflict in src/ui/units/wizard/actions/index.ts
Auto-merging src/ui/units/wizard/actions/preview.ts
CONFLICT (add/add): Merge conflict in src/ui/units/wizard/actions/preview.ts
Auto-merging src/ui/units/wizard/components/DatasetSelect/DatasetSelectItem.scss
CONFLICT (add/add): Merge conflict in src/ui/units/wizard/components/DatasetSelect/DatasetSelectItem.scss
Auto-merging src/ui/units/wizard/components/Dialogs/DialogPointsSize.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/wizard/components/Dialogs/DialogPointsSize.tsx
Auto-merging src/ui/units/wizard/components/Dialogs/Settings/Settings.scss
CONFLICT (add/add): Merge conflict in src/ui/units/wizard/components/Dialogs/Settings/Settings.scss
Auto-merging src/ui/units/wizard/components/Dialogs/Settings/Settings.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/wizard/components/Dialogs/Settings/Settings.tsx
Auto-merging src/ui/units/wizard/containers/Wizard/SectionPreview/SectionPreview.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/wizard/containers/Wizard/SectionPreview/SectionPreview.tsx
Auto-merging src/ui/units/wizard/containers/Wizard/SectionVisualization/VisualizationSelector/VisualizationSelector.scss
CONFLICT (add/add): Merge conflict in src/ui/units/wizard/containers/Wizard/SectionVisualization/VisualizationSelector/VisualizationSelector.scss
Auto-merging src/ui/utils/getActionPanelItems.tsx
CONFLICT (add/add): Merge conflict in src/ui/utils/getActionPanelItems.tsx
Auto-merging tests/README.md
CONFLICT (add/add): Merge conflict in tests/README.md
Auto-merging tests/docker-compose.e2e.yml
CONFLICT (add/add): Merge conflict in tests/docker-compose.e2e.yml
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/charts/preview/widget-width.test.ts/Charts-Preview-Table-widget-must-be-the-same-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/charts/preview/widget-width.test.ts/Charts-Preview-Table-widget-must-be-the-same-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/charts/preview/widget-width.test.ts/Charts-Preview-Table-widget-must-be-the-same-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/dash/screenshots/baseWidgets.test.ts/Dashboards---Base-widgets-screenshots-Widgets-without-autoheight-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/dash/screenshots/baseWidgets.test.ts/Dashboards---Base-widgets-screenshots-Widgets-without-autoheight-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/dash/screenshots/baseWidgets.test.ts/Dashboards---Base-widgets-screenshots-Widgets-without-autoheight-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/dash/screenshots/mobile.test.ts/Dashboards---Mobile-screenshots-Custom-order-of-widgets-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/dash/screenshots/mobile.test.ts/Dashboards---Mobile-screenshots-Custom-order-of-widgets-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/dash/screenshots/mobile.test.ts/Dashboards---Mobile-screenshots-Custom-order-of-widgets-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/dash/screenshots/mobile.test.ts/Dashboards---Mobile-screenshots-Default-order-of-widgets-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/dash/screenshots/mobile.test.ts/Dashboards---Mobile-screenshots-Default-order-of-widgets-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/dash/screenshots/mobile.test.ts/Dashboards---Mobile-screenshots-Default-order-of-widgets-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/coloring.test.ts/Wizard-Flat-table-Gradient-coloring-for-null-values-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/coloring.test.ts/Wizard-Flat-table-Gradient-coloring-for-null-values-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/coloring.test.ts/Wizard-Flat-table-Gradient-coloring-for-null-values-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/coloring.test.ts/Wizard-Flat-table-Gradient-coloring-for-zero-values-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/coloring.test.ts/Wizard-Flat-table-Gradient-coloring-for-zero-values-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/coloring.test.ts/Wizard-Flat-table-Gradient-coloring-for-zero-values-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/coloring.test.ts/Wizard-Flat-table-Gradient-coloring-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/coloring.test.ts/Wizard-Flat-table-Gradient-coloring-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/coloring.test.ts/Wizard-Flat-table-Gradient-coloring-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/linear-indicator.test.ts/Wizard-Flat-table-Linear-indicator-with-column-background-color-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/linear-indicator.test.ts/Wizard-Flat-table-Linear-indicator-with-column-background-color-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/linear-indicator.test.ts/Wizard-Flat-table-Linear-indicator-with-column-background-color-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/linear-indicator.test.ts/Wizard-Flat-table-Linear-indicator-with-manual-aee01-ax-value-is-less-than-the-actual-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/linear-indicator.test.ts/Wizard-Flat-table-Linear-indicator-with-manual-aee01-ax-value-is-less-than-the-actual-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/linear-indicator.test.ts/Wizard-Flat-table-Linear-indicator-with-manual-aee01-ax-value-is-less-than-the-actual-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/pinned-columns.test.ts/Wizard-Flat-table-Pinned-columns-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/pinned-columns.test.ts/Wizard-Flat-table-Pinned-columns-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/pinned-columns.test.ts/Wizard-Flat-table-Pinned-columns-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/pinned-columns.test.ts/Wizard-Flat-table-Pinned-columns-screenshot-2.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/pinned-columns.test.ts/Wizard-Flat-table-Pinned-columns-screenshot-2.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/pinned-columns.test.ts/Wizard-Flat-table-Pinned-columns-screenshot-2.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/pinned-columns.test.ts/Wizard-Flat-table-Pinned-columns-screenshot-3.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/pinned-columns.test.ts/Wizard-Flat-table-Pinned-columns-screenshot-3.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/pinned-columns.test.ts/Wizard-Flat-table-Pinned-columns-screenshot-3.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-Correct-order-of-rows-when-scrolling-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-Correct-order-of-rows-when-scrolling-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-Correct-order-of-rows-when-scrolling-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-Correct-order-of-rows-when-scrolling-screenshot-2.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-Correct-order-of-rows-when-scrolling-screenshot-2.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-Correct-order-of-rows-when-scrolling-screenshot-2.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-Dynamic-column-width-during-row-virtualization-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-Dynamic-column-width-during-row-virtualization-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-Dynamic-column-width-during-row-virtualization-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-Dynamic-column-width-during-row-virtualization-screenshot-2.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-Dynamic-column-width-during-row-virtualization-screenshot-2.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-Dynamic-column-width-during-row-virtualization-screenshot-2.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-The-correct-placement-of-the-totals-row-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-The-correct-placement-of-the-totals-row-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/flat-table/virtualization.test.ts/Wizard-Flat-table-The-correct-placement-of-the-totals-row-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/coloring.test.ts/Wizard-Pivot-table-Coloring-zero-values-with-a-gradient-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/coloring.test.ts/Wizard-Pivot-table-Coloring-zero-values-with-a-gradient-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/coloring.test.ts/Wizard-Pivot-table-Coloring-zero-values-with-a-gradient-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/coloring.test.ts/Wizard-Pivot-table-Custom-palette-bar-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/coloring.test.ts/Wizard-Pivot-table-Custom-palette-bar-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/coloring.test.ts/Wizard-Pivot-table-Custom-palette-bar-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/coloring.test.ts/Wizard-Pivot-table-Two-colors-bar-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/coloring.test.ts/Wizard-Pivot-table-Two-colors-bar-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/coloring.test.ts/Wizard-Pivot-table-Two-colors-bar-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/coloring.test.ts/Wizard-Pivot-table-Two-colors-bar-screenshot-2.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/coloring.test.ts/Wizard-Pivot-table-Two-colors-bar-screenshot-2.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/coloring.test.ts/Wizard-Pivot-table-Two-colors-bar-screenshot-2.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/column-settings.test.ts/Wizard-Pivot-table-Columns-width-for-complex-three-level-header-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/column-settings.test.ts/Wizard-Pivot-table-Columns-width-for-complex-three-level-header-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/column-settings.test.ts/Wizard-Pivot-table-Columns-width-for-complex-three-level-header-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/formatting.test.ts/Wizard-Pivot-table-Null-values-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/formatting.test.ts/Wizard-Pivot-table-Null-values-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/formatting.test.ts/Wizard-Pivot-table-Null-values-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/header.test.ts/Wizard-Pivot-table-Complex-three-level-header-in-the-table-head-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/header.test.ts/Wizard-Pivot-table-Complex-three-level-header-in-the-table-head-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/header.test.ts/Wizard-Pivot-table-Complex-three-level-header-in-the-table-head-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/header.test.ts/Wizard-Pivot-table-Complex-three-level-header-in-the-table-rows-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/header.test.ts/Wizard-Pivot-table-Complex-three-level-header-in-the-table-rows-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/header.test.ts/Wizard-Pivot-table-Complex-three-level-header-in-the-table-rows-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/header.test.ts/Wizard-Pivot-table-Grouping-rows-with-markup-values-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/header.test.ts/Wizard-Pivot-table-Grouping-rows-with-markup-values-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/header.test.ts/Wizard-Pivot-table-Grouping-rows-with-markup-values-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/header.test.ts/Wizard-Pivot-table-Grouping-rows-with-the-same-value-in-the-previous-column-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/header.test.ts/Wizard-Pivot-table-Grouping-rows-with-the-same-value-in-the-previous-column-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/header.test.ts/Wizard-Pivot-table-Grouping-rows-with-the-same-value-in-the-previous-column-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/no-data.test.ts/Wizard-Pivot-table-No-data-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/no-data.test.ts/Wizard-Pivot-table-No-data-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/no-data.test.ts/Wizard-Pivot-table-No-data-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/pinned-columns.test.ts/Wizard-Pivot-table-Pinned-columns-with-subtotals-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/pinned-columns.test.ts/Wizard-Pivot-table-Pinned-columns-with-subtotals-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/pinned-columns.test.ts/Wizard-Pivot-table-Pinned-columns-with-subtotals-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/pinned-columns.test.ts/Wizard-Pivot-table-Pinned-columns-with-subtotals-screenshot-2.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/pinned-columns.test.ts/Wizard-Pivot-table-Pinned-columns-with-subtotals-screenshot-2.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/pinned-columns.test.ts/Wizard-Pivot-table-Pinned-columns-with-subtotals-screenshot-2.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/totals.test.ts/Wizard-Pivot-table-Subtotals-for-Rows-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/totals.test.ts/Wizard-Pivot-table-Subtotals-for-Rows-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/totals.test.ts/Wizard-Pivot-table-Subtotals-for-Rows-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/virtualization.test.ts/Wizard-Pivot-table-Correct-order-of-rows-when-scrolling-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/virtualization.test.ts/Wizard-Pivot-table-Correct-order-of-rows-when-scrolling-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/virtualization.test.ts/Wizard-Pivot-table-Correct-order-of-rows-when-scrolling-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/virtualization.test.ts/Wizard-Pivot-table-Correct-order-of-rows-when-scrolling-screenshot-2.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/virtualization.test.ts/Wizard-Pivot-table-Correct-order-of-rows-when-scrolling-screenshot-2.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/virtualization.test.ts/Wizard-Pivot-table-Correct-order-of-rows-when-scrolling-screenshot-2.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/virtualization.test.ts/Wizard-Pivot-table-Scroll-for-tables-with-row-grouping-and-fixed-column-width-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/virtualization.test.ts/Wizard-Pivot-table-Scroll-for-tables-with-row-grouping-and-fixed-column-width-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/virtualization.test.ts/Wizard-Pivot-table-Scroll-for-tables-with-row-grouping-and-fixed-column-width-screenshot-1.png
warning: Cannot merge binary files: tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/virtualization.test.ts/Wizard-Pivot-table-The-correct-placement-of-the-totals-row-screenshot-1.png (HEAD vs. 5be63df5 (Change pransparrent font settings))
Auto-merging tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/virtualization.test.ts/Wizard-Pivot-table-The-correct-placement-of-the-totals-row-screenshot-1.png
CONFLICT (add/add): Merge conflict in tests/opensource-suites/__screenshots__/wizard/visualizations/pivot-table/virtualization.test.ts/Wizard-Pivot-table-The-correct-placement-of-the-totals-row-screenshot-1.png
Auto-merging tests/opensource-suites/dash/base/loading.test.ts
CONFLICT (add/add): Merge conflict in tests/opensource-suites/dash/base/loading.test.ts
Auto-merging tests/opensource-suites/wizard/visualizations/pivot-table/totals.test.ts
CONFLICT (add/add): Merge conflict in tests/opensource-suites/wizard/visualizations/pivot-table/totals.test.ts
Auto-merging tests/page-objects/workbook/Workbook.ts
CONFLICT (add/add): Merge conflict in tests/page-objects/workbook/Workbook.ts
Auto-merging tests/playwright.config.ts
CONFLICT (add/add): Merge conflict in tests/playwright.config.ts
Auto-merging tests/utils/index.ts
CONFLICT (add/add): Merge conflict in tests/utils/index.ts
error: could not apply 5be63df5... Change pransparrent font settings
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 5be63df5... Change pransparrent font settings
 (1)

Resolve conflicts according to instructions

  1. Switch to the current branch associated with this pull request.
git checkout CHARTS-10652
  1. Add Weblate as remote. And remove previous upstream with the same name:
git remote remove weblate 2> /dev/null
git remote add weblate https://weblate.gravity-ui.com/git/datalens/charts-10652-1823/chartkit-1823/
git -c http.sslVerify=false remote update weblate
  1. Merge Weblate changes:
git merge weblate/CHARTS-10652
  1. Resolve conflicts:
edit ...
git add ...
git commit
  1. Push changes to upstream repository, Weblate will fetch merge from there:
git push origin

@robot-charts
Copy link
Collaborator

i18n-check

Errors occurred when merging changes from your branch with the Weblate branch. 
Rebasing (1/1)
Auto-merging src/ui/components/DialogTextWidget/DialogTextWidget.tsx
CONFLICT (content): Merge conflict in src/ui/components/DialogTextWidget/DialogTextWidget.tsx
Auto-merging src/ui/components/DialogTitleWidget/DialogTitleWidget.tsx
CONFLICT (content): Merge conflict in src/ui/components/DialogTitleWidget/DialogTitleWidget.tsx
error: could not apply acdb04ab... Design fixes
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 acdb04ab... Design fixes
 (1)

Resolve conflicts according to instructions

  1. Switch to the current branch associated with this pull request.
git checkout CHARTS-10652
  1. Add Weblate as remote. And remove previous upstream with the same name:
git remote remove weblate 2> /dev/null
git remote add weblate https://weblate.gravity-ui.com/git/datalens/charts-10652-1823/chartkit-1823/
git -c http.sslVerify=false remote update weblate
  1. Merge Weblate changes:
git merge weblate/CHARTS-10652
  1. Resolve conflicts:
edit ...
git add ...
git commit
  1. Push changes to upstream repository, Weblate will fetch merge from there:
git push origin

@robot-charts
Copy link
Collaborator

i18n-check

Errors occurred when merging changes from your branch with the Weblate branch. 
warning: skipped previously applied commit cfea5f34
warning: skipped previously applied commit 5508dfb9
warning: skipped previously applied commit 71b490ac
warning: skipped previously applied commit 0e17e398
hint: use --reapply-cherry-picks to include skipped commits
hint: Disable this message with "git config advice.skippedCherryPicks false"
Rebasing (1/6)
Auto-merging src/ui/components/DashKit/plugins/Image/Image.tsx
CONFLICT (content): Merge conflict in src/ui/components/DashKit/plugins/Image/Image.tsx
Auto-merging src/ui/components/DashKit/plugins/Text/Text.tsx
CONFLICT (content): Merge conflict in src/ui/components/DashKit/plugins/Text/Text.tsx
Auto-merging src/ui/components/DashKit/plugins/Title/Title.tsx
CONFLICT (content): Merge conflict in src/ui/components/DashKit/plugins/Title/Title.tsx
Auto-merging src/ui/components/DialogChartWidget/DialogChartWidget.tsx
Auto-merging src/ui/components/DialogImageWidget/DialogImageWidget.tsx
Auto-merging src/ui/components/DialogTextWidget/DialogTextWidget.scss
Auto-merging src/ui/components/DialogTextWidget/DialogTextWidget.tsx
CONFLICT (content): Merge conflict in src/ui/components/DialogTextWidget/DialogTextWidget.tsx
Auto-merging src/ui/components/DialogTitleWidget/DialogTitleWidget.scss
CONFLICT (content): Merge conflict in src/ui/components/DialogTitleWidget/DialogTitleWidget.scss
Auto-merging src/ui/components/DialogTitleWidget/DialogTitleWidget.tsx
CONFLICT (content): Merge conflict in src/ui/components/DialogTitleWidget/DialogTitleWidget.tsx
Auto-merging src/ui/units/dash/containers/Dialogs/components/PaletteBackground/PaletteBackground.scss
Auto-merging src/ui/units/dash/containers/Dialogs/components/PaletteBackground/PaletteBackground.tsx
CONFLICT (content): Merge conflict in src/ui/units/dash/containers/Dialogs/components/PaletteBackground/PaletteBackground.tsx
error: could not apply 1e5a3687... Remove background enabling checkboxes & change title size switcher
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 1e5a3687... Remove background enabling checkboxes & change title size switcher
 (1)

Resolve conflicts according to instructions

  1. Switch to the current branch associated with this pull request.
git checkout CHARTS-10652
  1. Add Weblate as remote. And remove previous upstream with the same name:
git remote remove weblate 2> /dev/null
git remote add weblate https://weblate.gravity-ui.com/git/datalens/charts-10652-1823/chartkit-1823/
git -c http.sslVerify=false remote update weblate
  1. Merge Weblate changes:
git merge weblate/CHARTS-10652
  1. Resolve conflicts:
edit ...
git add ...
git commit
  1. Push changes to upstream repository, Weblate will fetch merge from there:
git push origin

@robot-charts
Copy link
Collaborator

i18n-check

Errors occurred when merging changes from your branch with the Weblate branch. 
Rebasing (1/18)
Auto-merging src/ui/components/DialogChartWidget/DialogChartWidget.tsx
CONFLICT (content): Merge conflict in src/ui/components/DialogChartWidget/DialogChartWidget.tsx
Auto-merging src/ui/components/DialogImageWidget/DialogImageWidget.tsx
CONFLICT (content): Merge conflict in src/ui/components/DialogImageWidget/DialogImageWidget.tsx
Auto-merging src/ui/components/DialogTextWidget/DialogTextWidget.tsx
CONFLICT (content): Merge conflict in src/ui/components/DialogTextWidget/DialogTextWidget.tsx
Auto-merging src/ui/components/DialogTitleWidget/DialogTitleWidget.tsx
CONFLICT (content): Merge conflict in src/ui/components/DialogTitleWidget/DialogTitleWidget.tsx
Auto-merging src/ui/units/dash/containers/Dialogs/components/PaletteBackground/PaletteBackground.tsx
CONFLICT (content): Merge conflict in src/ui/units/dash/containers/Dialogs/components/PaletteBackground/PaletteBackground.tsx
error: could not apply 3e044283... Change pransparrent font settings
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 3e044283... Change pransparrent font settings
 (1)

Resolve conflicts according to instructions

  1. Switch to the current branch associated with this pull request.
git checkout CHARTS-10652
  1. Add Weblate as remote. And remove previous upstream with the same name:
git remote remove weblate 2> /dev/null
git remote add weblate https://weblate.gravity-ui.com/git/datalens/charts-10652-1823/chartkit-1823/
git -c http.sslVerify=false remote update weblate
  1. Merge Weblate changes:
git merge weblate/CHARTS-10652
  1. Resolve conflicts:
edit ...
git add ...
git commit
  1. Push changes to upstream repository, Weblate will fetch merge from there:
git push origin

@DaryaLari DaryaLari force-pushed the CHARTS-10652 branch 2 times, most recently from 16b8ae4 to 4e16c16 Compare December 6, 2024 10:34
@robot-charts
Copy link
Collaborator

i18n-check

Errors occurred when merging changes from your branch with the Weblate branch. 
Rebasing (1/19)
Auto-merging src/ui/components/DialogChartWidget/DialogChartWidget.scss
CONFLICT (content): Merge conflict in src/ui/components/DialogChartWidget/DialogChartWidget.scss
Auto-merging src/ui/components/DialogChartWidget/DialogChartWidget.tsx
CONFLICT (content): Merge conflict in src/ui/components/DialogChartWidget/DialogChartWidget.tsx
Auto-merging src/ui/components/DialogImageWidget/DialogImageWidget.tsx
Auto-merging src/ui/components/DialogTextWidget/DialogTextWidget.scss
CONFLICT (content): Merge conflict in src/ui/components/DialogTextWidget/DialogTextWidget.scss
Auto-merging src/ui/components/DialogTitleWidget/DialogTitleWidget.scss
CONFLICT (content): Merge conflict in src/ui/components/DialogTitleWidget/DialogTitleWidget.scss
Auto-merging src/ui/components/DialogTitleWidget/DialogTitleWidget.tsx
CONFLICT (content): Merge conflict in src/ui/components/DialogTitleWidget/DialogTitleWidget.tsx
error: could not apply e70f44be... Change pransparrent font settings
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 e70f44be... Change pransparrent font settings
 (1)

Resolve conflicts according to instructions

  1. Switch to the current branch associated with this pull request.
git checkout CHARTS-10652
  1. Add Weblate as remote. And remove previous upstream with the same name:
git remote remove weblate 2> /dev/null
git remote add weblate https://weblate.gravity-ui.com/git/datalens/charts-10652-1823/chartkit-1823/
git -c http.sslVerify=false remote update weblate
  1. Merge Weblate changes:
git merge weblate/CHARTS-10652
  1. Resolve conflicts:
edit ...
git add ...
git commit
  1. Push changes to upstream repository, Weblate will fetch merge from there:
git push origin

@DaryaLari DaryaLari requested a review from flops December 9, 2024 13:27
@DaryaLari DaryaLari merged commit 8d3f576 into main Dec 9, 2024
9 checks passed
@DaryaLari DaryaLari deleted the CHARTS-10652 branch December 9, 2024 13:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Marginy605 Marginy605 Marginy605 approved these changes

@flops flops Awaiting requested review from flops

Assignees
No one assigned
Labels
changelog component/dashboards type/feat
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@DaryaLari @robot-charts @Marginy605