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

Add YAML code and YAML explanation to Launch/Using-Substitutions (backport #4182) #4194

Merged
merged 1 commit into from
Feb 29, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 29, 2024

This is an automatic backport of pull request #4182 done by Mergify.
Cherry-pick of 39caeba has failed:

On branch mergify/bp/humble/pr-4182
Your branch is up to date with 'origin/humble'.

You are currently cherry-picking commit 39caeba6.
  (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:   source/Tutorials/Intermediate/Launch/Using-Substitutions.rst

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 commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot added the conflicts label Feb 29, 2024
@mergify mergify bot requested review from clalancette and audrow as code owners February 29, 2024 16:39
Copy link
Contributor Author

mergify bot commented Feb 29, 2024

Cherry-pick of 39caeba has failed:

On branch mergify/bp/humble/pr-4182
Your branch is up to date with 'origin/humble'.

You are currently cherry-picking commit 39caeba6.
  (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:   source/Tutorials/Intermediate/Launch/Using-Substitutions.rst

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

* Add YAML code and YAML explanation to Launch/Using-Substitutions

* Update source/Tutorials/Intermediate/Launch/Using-Substitutions.rst

Add proposed change from #4182

Signed-off-by: Christian Ruf <[email protected]>
Co-authored-by: Chris Lalancette <[email protected]>
(cherry picked from commit 39caeba)
@clalancette clalancette force-pushed the mergify/bp/humble/pr-4182 branch from 84d81b4 to 670fc20 Compare February 29, 2024 18:41
@clalancette clalancette merged commit 57bde36 into humble Feb 29, 2024
3 checks passed
@delete-merged-branch delete-merged-branch bot deleted the mergify/bp/humble/pr-4182 branch February 29, 2024 18:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants