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

Refs 13882. Fixes for _UNICODE macro on Visual Studio (backport #2510) #2513

Merged
merged 1 commit into from
Jul 18, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 18, 2022

This is an automatic backport of pull request #2510 done by Mergify.
Cherry-pick of 49e7986 has failed:

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

You are currently cherry-picking commit 49e7986ff.
  (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/cpp/utils/StringMatching.cpp

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   src/cpp/utils/SystemInfo.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

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Feb 18, 2022
@mergify mergify bot deleted the mergify/bp/2.1.x/pr-2510 branch February 18, 2022 13:15
@MiguelBarro MiguelBarro restored the mergify/bp/2.1.x/pr-2510 branch February 18, 2022 13:15
Signed-off-by: Miguel Barro <miguelbarro@eprosima.com>
@MiguelBarro MiguelBarro removed the conflicts Backport PR wich git cherry pick failed label Feb 18, 2022
@MiguelBarro MiguelBarro reopened this Feb 18, 2022
@MiguelCompany MiguelCompany added this to the v2.1.2 milestone Mar 11, 2022
@MiguelCompany MiguelCompany merged commit 9d50f38 into 2.1.x Jul 18, 2022
@MiguelCompany MiguelCompany deleted the mergify/bp/2.1.x/pr-2510 branch July 18, 2022 08:03
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