Skip to content

chore(docs): alter the section about the effects of timeout_commit (backport #1892)#2313

Merged
melekes merged 2 commits intov0.38.xfrom
mergify/bp/v0.38.x/pr-1892
Feb 12, 2024
Merged

chore(docs): alter the section about the effects of timeout_commit (backport #1892)#2313
melekes merged 2 commits intov0.38.xfrom
mergify/bp/v0.38.x/pr-1892

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Feb 12, 2024

This is an automatic backport of pull request #1892 done by Mergify.
Cherry-pick of 460f58c has failed:

On branch mergify/bp/v0.38.x/pr-1892
Your branch is up to date with 'origin/v0.38.x'.

You are currently cherry-picking commit 460f58ccd.
  (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:   docs/core/configuration.md

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 requested a review from a team as a code owner February 12, 2024 11:28
@mergify mergify bot added the conflicts label Feb 12, 2024
@melekes melekes merged commit 8d52002 into v0.38.x Feb 12, 2024
@melekes melekes deleted the mergify/bp/v0.38.x/pr-1892 branch February 12, 2024 11:35
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