Skip to content

Dash fixed header redesign #1183

Dash fixed header redesign

Dash fixed header redesign #1183

Triggered via pull request December 3, 2024 07:57
@DaryaLariDaryaLari
synchronize #1863
Status Failure
Total duration 1m 11s
Artifacts

i18n-check.yml

on: pull_request_target
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/2) Auto-merging src/i18n-keysets/dash.main.view/ru.json CONFLICT (content): Merge conflict in src/i18n-keysets/dash.main.view/ru.json error: could not apply 5c9773c07... Translated using Weblate (Russian) 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 5c9773c07... Translated using Weblate (Russian) (1) ``` </details> **Resolve conflicts according to instructions** 1. Switch to the current branch associated with this pull request. ``` git checkout CHARTS-10604 ``` 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-10604-1863/chartkit-1863/ git -c http.sslVerify=false remote update weblate ``` 3. Merge Weblate changes: ``` git merge weblate/CHARTS-10604 ``` 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