Skip to content

WIP: Charts 9786 no create permissions dialog #1252

WIP: Charts 9786 no create permissions dialog

WIP: Charts 9786 no create permissions dialog #1252

Re-run triggered December 12, 2024 09:47
Status Failure
Total duration 32s
Artifacts

i18n-check.yml

on: pull_request_target
i18n_check
21s
i18n_check
Fit to window
Zoom out
Zoom in

Annotations

1 error and 1 warning
i18n_check
**i18n-check** <details> <summary>Errors occurred when merging changes from your branch with the Weblate branch.</summary> ``` Rebasing (1/1) Auto-merging src/ui/components/CollectionsStructure/CollectionNoCreatePermissionDialog/CollectionNoCreatePermissionDialog.tsx CONFLICT (add/add): Merge conflict in src/ui/components/CollectionsStructure/CollectionNoCreatePermissionDialog/CollectionNoCreatePermissionDialog.tsx Auto-merging src/ui/components/CollectionsStructure/CollectionNoCreatePermissionDialog/index.ts CONFLICT (add/add): Merge conflict in src/ui/components/CollectionsStructure/CollectionNoCreatePermissionDialog/index.ts Auto-merging src/ui/components/CollectionsStructure/index.ts CONFLICT (add/add): Merge conflict in src/ui/components/CollectionsStructure/index.ts Auto-merging src/ui/components/DialogInfo/index.ts CONFLICT (add/add): Merge conflict in src/ui/components/DialogInfo/index.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/collections/components/CollectionActions/CollectionActions.tsx CONFLICT (add/add): Merge conflict in src/ui/units/collections/components/CollectionActions/CollectionActions.tsx Auto-merging src/ui/units/collections/components/CollectionPage/CollectionPage.tsx CONFLICT (add/add): Merge conflict in src/ui/units/collections/components/CollectionPage/CollectionPage.tsx Auto-merging src/ui/units/collections/components/CollectionPage/hooks/useLayout.tsx CONFLICT (add/add): Merge conflict in src/ui/units/collections/components/CollectionPage/hooks/useLayout.tsx error: could not apply 702b4c0e3... Merge branch 'main' into CHARTS-9786_no_create_permissions_dialog 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 702b4c0e3... Merge branch 'main' into CHARTS-9786_no_create_permissions_dialog (1) ``` </details> **Resolve conflicts according to instructions** 1. Switch to the current branch associated with this pull request. ``` git checkout CHARTS-9786_no_create_permissions_dialog ``` 2. 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-9786-no-create-permissions-dialog-1932/chartkit-1932/ git -c http.sslVerify=false remote update weblate ``` 3. Merge Weblate changes: ``` git merge weblate/CHARTS-9786_no_create_permissions_dialog ``` 4. Resolve conflicts: ``` edit ... git add ... git commit ``` 5. Push changes to upstream repository, Weblate will fetch merge from there: ``` git push origin ```
i18n_check
ubuntu-latest pipelines will use ubuntu-24.04 soon. For more details, see https://github.com/actions/runner-images/issues/10636