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.

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

docs: Update migration doc (backport #18288) #18314

Merged
merged 18 commits into from
Sep 26, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 26, 2024


This is an automatic backport of pull request #18288 done by [Mergify](https://mergify.com).

jeromelaban and others added 17 commits September 26, 2024 18:52
(cherry picked from commit 5cdd4cd)
(cherry picked from commit 13a0ca4)
(cherry picked from commit c33c7ba)
(cherry picked from commit 478d58f)
(cherry picked from commit 6d90886)
Co-authored-by: Agnès ZITTE <16295702+agneszitte@users.noreply.github.com>
(cherry picked from commit 68d047e)
(cherry picked from commit 09a1c40)
(cherry picked from commit 0fafcd0)
(cherry picked from commit 973c1da)
Co-authored-by: Andres Pineda <1900897+ajpinedam@users.noreply.github.com>
(cherry picked from commit f4bcd66)
(cherry picked from commit 952691c)
(cherry picked from commit 283215a)

# Conflicts:
#	doc/import_external_docs.ps1
(cherry picked from commit 53b792e)

# Conflicts:
#	doc/import_external_docs.ps1
(cherry picked from commit 510546b)

# Conflicts:
#	doc/import_external_docs.ps1
Copy link
Contributor Author

mergify bot commented Sep 26, 2024

Cherry-pick of 283215a has failed:

On branch mergify/bp/release/stable/5.4/pr-18288
Your branch is ahead of 'origin/release/stable/5.4' by 14 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 283215aab8.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   doc/import_external_docs.ps1

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 53b792e has failed:

On branch mergify/bp/release/stable/5.4/pr-18288
Your branch is ahead of 'origin/release/stable/5.4' by 15 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 53b792eb9c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   doc/import_external_docs.ps1

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 510546b has failed:

On branch mergify/bp/release/stable/5.4/pr-18288
Your branch is ahead of 'origin/release/stable/5.4' by 16 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 510546bd74.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   doc/import_external_docs.ps1

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added the conflicts label Sep 26, 2024
@mergify mergify bot mentioned this pull request Sep 26, 2024
@github-actions github-actions bot added area/build Categorizes an issue or PR as relevant to build infrastructure kind/documentation labels Sep 26, 2024
@jeromelaban jeromelaban merged commit 769a16d into release/stable/5.4 Sep 26, 2024
10 of 13 checks passed
@jeromelaban jeromelaban deleted the mergify/bp/release/stable/5.4/pr-18288 branch September 26, 2024 19:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/build Categorizes an issue or PR as relevant to build infrastructure conflicts kind/documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants