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

Correctly map ImageManager list model index to topic vector (backport #46) #47

Merged
merged 4 commits into from
Sep 19, 2022

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Sep 19, 2022

This is an automatic backport of pull request #46 done by Mergify.
Cherry-pick of e4d9ab7 has failed:

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

You are currently cherry-picking commit e4d9ab7.
  (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/rm <file>..." as appropriate to mark resolution)
	deleted by us:   dependencies.repos

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/github/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

Marcel Zeilinger and others added 3 commits September 19, 2022 13:19
Signed-off-by: Kenji Brameld <kenjibrameld@gmail.com>
(cherry picked from commit 7191f63)
Signed-off-by: Kenji Brameld <kenjibrameld@gmail.com>
(cherry picked from commit e4d9ab7)

# Conflicts:
#	dependencies.repos
Signed-off-by: Kenji Brameld <kenjibrameld@gmail.com>
@ijnek ijnek merged commit a8ca2b2 into galactic Sep 19, 2022
@ijnek ijnek deleted the mergify/bp/galactic/pr-46 branch September 19, 2022 13:26
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.

None yet

1 participant