Skip to content

[CONFLICT] [Backport stable-25-4] PR #37350: DOCSUP-126759: [YDBDOCS-1922] Переводы Февраля - 12. Организация процесса перевода (1 архив) (0 шт.)#42272

Draft
ydbot wants to merge 1 commit into
stable-25-4from
cherry-pick-stable-25-4-260602-172538

Conversation

@ydbot
Copy link
Copy Markdown
Collaborator

@ydbot ydbot commented Jun 2, 2026

Changelog entry

DOCSUP-126759: [YDBDOCS-1922] Переводы Февраля - 12. Организация процесса перевода (1 архив) (0 шт.): [docs] Tratslated YQL reference documentation en

Changelog category

  • Documentation (changelog entry is not required)

Description for reviewers

Original PR(s)

Metadata

Conflicts Require Manual Resolution

This PR contains merge conflicts that require manual resolution.

Files with conflicts:

How to resolve conflicts:

git fetch origin
git checkout --track origin/cherry-pick-stable-25-4-260602-172538
# Resolve conflicts in files
git add .
git commit -m "Resolved merge conflicts"
git push

After resolving conflicts:

  1. Fix the PR title (remove [CONFLICT] if conflicts are resolved)
  2. Mark PR as ready for review

Git Cherry-Pick Log

=== Cherry-picking ecfe717 ===
Auto-merging ydb/docs/en/core/yql/reference/syntax/toc_i.yaml
CONFLICT (content): Merge conflict in ydb/docs/en/core/yql/reference/syntax/toc_i.yaml
Auto-merging ydb/docs/en/core/yql/reference/syntax/truncate-table.md
CONFLICT (add/add): Merge conflict in ydb/docs/en/core/yql/reference/syntax/truncate-table.md

error: could not apply ecfe717e65e... DOCSUP-126759: [YDBDOCS-1922] Переводы Февраля - 12. Организация процесса перевода (1 архив) (0 шт.) (#37350)
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

PR was created by cherry-pick workflow run

@ydbot
Copy link
Copy Markdown
Collaborator Author

ydbot commented Jun 2, 2026

Run Extra Tests

Run additional tests for this PR. You can customize:

  • Test Size: small, medium, large (default: small, medium)
  • Test Targets: any directory path (default: ydb/)
  • Sanitizers: ASAN, MSAN, TSAN
  • Coredumps: enable for debugging (default: off)
  • Additional args: custom ya make arguments

▶  Run tests

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Jun 2, 2026

❌ Documentation build

Revision build failed

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Jun 2, 2026

2026-06-02 17:30:39 UTC Pre-commit check linux-x86_64-release-asan for 4e86c07 has started.
2026-06-02 17:30:55 UTC Artifacts will be uploaded here
2026-06-02 17:33:31 UTC ya make is running...
🟢 2026-06-02 17:33:37 UTC Tests successful.

Ya make output | Test bloat

TESTS PASSED ERRORS FAILED SKIPPED MUTED?
0 0 0 0 0 0

🟢 2026-06-02 17:33:40 UTC Build successful.

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Jun 2, 2026

2026-06-02 17:31:47 UTC Pre-commit check linux-x86_64-relwithdebinfo for 4e86c07 has started.
2026-06-02 17:31:51 UTC Artifacts will be uploaded here
2026-06-02 17:34:22 UTC ya make is running...
🟢 2026-06-02 17:34:28 UTC Tests successful.

Ya make output | Test bloat

TESTS PASSED ERRORS FAILED SKIPPED MUTED?
0 0 0 0 0 0

🟢 2026-06-02 17:34:31 UTC Build successful.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

documentation Improvements or additions to documentation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants