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

[20306] Add an auto fill type information check (backport #107) #110

Merged
merged 3 commits into from
Jan 30, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jan 26, 2024

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

On branch mergify/bp/2.10.x/pr-107
Your branch is up to date with 'origin/2.10.x'.

You are currently cherry-picking commit a002fdb.
  (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/shapesdemo/ShapesDemo.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   forms/participantdialog.ui
	both modified:   include/eprosimashapesdemo/qt/participantdialog.h
	both modified:   include/eprosimashapesdemo/shapesdemo/ShapesDemo.h
	both modified:   src/qt/participantdialog.cpp

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

* Refs #20306: Add autofill type information check

Signed-off-by: EduPonz <[email protected]>

* Refs #20306: Apply Miguel's suggestions

Signed-off-by: EduPonz <[email protected]>

---------

Signed-off-by: EduPonz <[email protected]>
(cherry picked from commit a002fdb)

# Conflicts:
#	forms/participantdialog.ui
#	include/eprosimashapesdemo/qt/participantdialog.h
#	include/eprosimashapesdemo/shapesdemo/ShapesDemo.h
#	src/qt/participantdialog.cpp
@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Jan 26, 2024
@JesusPoderoso JesusPoderoso added this to the v2.10.3 milestone Jan 26, 2024
Signed-off-by: JesusPoderoso <[email protected]>
@JesusPoderoso JesusPoderoso added needs-review and removed conflicts Backport PR wich git cherry pick failed labels Jan 26, 2024
Signed-off-by: JesusPoderoso <[email protected]>
@JesusPoderoso JesusPoderoso force-pushed the mergify/bp/2.10.x/pr-107 branch from 55458de to 7348c2b Compare January 26, 2024 09:45
@JesusPoderoso JesusPoderoso merged commit 5ab162a into 2.10.x Jan 30, 2024
2 checks passed
@JesusPoderoso JesusPoderoso deleted the mergify/bp/2.10.x/pr-107 branch January 30, 2024 15:09
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.

2 participants