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: Adjust vs getting started (backport #18602) #18614

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 29, 2024


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

jeromelaban and others added 5 commits October 29, 2024 11:52
(cherry picked from commit 6f8dea7)
(cherry picked from commit 2bea5da)
Co-authored-by: Dominik Titl <78549750+morning4coffe-dev@users.noreply.github.com>
(cherry picked from commit e6107fa)
(cherry picked from commit a806879)

# Conflicts:
#	doc/import_external_docs.ps1
(cherry picked from commit 75bea27)
@mergify mergify bot added the conflicts label Oct 29, 2024
Copy link
Contributor Author

mergify bot commented Oct 29, 2024

Cherry-pick of a806879 has failed:

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

You are currently cherry-picking commit a806879421.
  (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

@jeromelaban jeromelaban enabled auto-merge October 29, 2024 15:32
@jeromelaban jeromelaban merged commit 3db3f22 into release/stable/5.5 Oct 29, 2024
3 of 12 checks passed
@jeromelaban jeromelaban deleted the mergify/bp/release/stable/5.5/pr-18602 branch October 29, 2024 15:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant