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

chore: fix Auto Release and mergify config (backport #534) #546

Merged
merged 5 commits into from
Dec 24, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 17, 2024


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

Copy link
Contributor Author

mergify bot commented Dec 17, 2024

Cherry-pick of d1f28b6 has failed:

On branch mergify/bp/version-15-hotfix/pr-534
Your branch is ahead of 'origin/version-15-hotfix' by 1 commit.
  (use "git push" to publish your local commits)

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

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

Cherry-pick of 7108dfb has failed:

On branch mergify/bp/version-15-hotfix/pr-534
Your branch is ahead of 'origin/version-15-hotfix' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 7108dfb.
  (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:   .github/workflows/on_release.yml

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

@Sajinsr Sajinsr closed this Dec 17, 2024
@Sajinsr Sajinsr reopened this Dec 24, 2024
(cherry picked from commit abf6a22)
(cherry picked from commit d1f28b6)

# Conflicts:
#	.releaserc
(cherry picked from commit 7108dfb)

# Conflicts:
#	.github/workflows/on_release.yml
@Sajinsr Sajinsr force-pushed the mergify/bp/version-15-hotfix/pr-534 branch from 9697d3a to 357d1b7 Compare December 24, 2024 07:31
@Sajinsr Sajinsr removed the conflicts label Dec 24, 2024
@Sajinsr Sajinsr merged commit cf2e836 into version-15-hotfix Dec 24, 2024
5 checks passed
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