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

[bugfix] Update version configurations (backport #5771) #5778

Merged
merged 3 commits into from
Sep 3, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 3, 2024

Description

This is an automatic backport of pull request #5771 done by Mergify.

Cherry-pick of 773f027 has failed:

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

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

Changes to be committed:
	modified:   src/abqpy/__init__.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   pyproject.toml

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

haiiliin and others added 2 commits September 3, 2024 15:00
(cherry picked from commit 773f027)

# Conflicts:
#	pyproject.toml
@mergify mergify bot added 2017 backport Backport pull request created by Mergify conflicts Conflict with its base branch labels Sep 3, 2024
Copy link
Contributor Author

mergify bot commented Sep 3, 2024

Cherry-pick of 773f027 has failed:

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

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

Changes to be committed:
	modified:   src/abqpy/__init__.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   pyproject.toml

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

Copy link
Contributor

github-actions bot commented Sep 3, 2024

Hi @mergify[bot], I have deleted the conflicted deleted files in this pull request. Please check it again. Thanks!

@haiiliin haiiliin removed the conflicts Conflict with its base branch label Sep 3, 2024
@mergify mergify bot merged commit 3697ca7 into 2017 Sep 3, 2024
2 of 4 checks passed
@mergify mergify bot deleted the mergify/bp/2017/pr-5771 branch September 3, 2024 15:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
2017 backport Backport pull request created by Mergify bugfix
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant