Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jun 21, 2023

This is an automatic copy of pull request #4337 done by Mergify.


Issue

https://gravitee.atlassian.net/browse/APIM-2049

Description

This brings a fix netplex/json-smart-v2#133

Additional context


📚  View the storybook of this branch here


Cherry-pick of 6e85760 has failed:

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

You are currently cherry-picking commit 6e857606ae.
  (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:   pom.xml

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 mergify bot requested a review from a team as a code owner June 21, 2023 08:11
@mergify mergify bot added the conflicts label Jun 21, 2023
@jgiovaresco jgiovaresco force-pushed the mergify/bp/3.19.x/pr-4337 branch from fd45c35 to e962520 Compare June 21, 2023 08:51
@jgiovaresco jgiovaresco enabled auto-merge (rebase) June 21, 2023 08:53
@jgiovaresco jgiovaresco disabled auto-merge June 21, 2023 09:01
@jgiovaresco jgiovaresco merged commit c15d1f9 into 3.19.x Jun 21, 2023
@jgiovaresco jgiovaresco deleted the mergify/bp/3.19.x/pr-4337 branch June 21, 2023 09:02
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