Skip to content
This repository was archived by the owner on Jul 11, 2023. It is now read-only.

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jun 7, 2021

This is an automatic backport of pull request #3524 done by Mergify.
Cherry-pick of 56d9248 has failed:

On branch mergify/bp/release-v0.9/pr-3524
Your branch is up to date with 'origin/release-v0.9'.

You are currently cherry-picking commit 56d9248e.
  (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:   charts/osm/crds/meshconfig.yaml

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://help.github.com/articles/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.io/

Signed-off-by: nshankar13 <nshankar@microsoft.com>
(cherry picked from commit 56d9248)

# Conflicts:
#	charts/osm/crds/meshconfig.yaml
@mergify mergify bot requested a review from a team as a code owner June 7, 2021 18:22
@mergify mergify bot added the conflicts label Jun 7, 2021
@codecov-commenter
Copy link

Codecov Report

Merging #3529 (56599d1) into release-v0.9 (ff6cd4d) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@              Coverage Diff              @@
##           release-v0.9    #3529   +/-   ##
=============================================
  Coverage         65.82%   65.82%           
=============================================
  Files               169      169           
  Lines              7886     7886           
=============================================
  Hits               5191     5191           
  Misses             2664     2664           
  Partials             31       31           
Flag Coverage Δ
unittests 65.82% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.


Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ff6cd4d...56599d1. Read the comment docs.

@nshankar13 nshankar13 closed this Jun 7, 2021
@mergify mergify bot deleted the mergify/bp/release-v0.9/pr-3524 branch June 7, 2021 18:44
@nshankar13 nshankar13 restored the mergify/bp/release-v0.9/pr-3524 branch June 7, 2021 18:54
@nshankar13 nshankar13 reopened this Jun 7, 2021
Copy link
Member

@shashankram shashankram left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needs conflict resolution.

@nshankar13
Copy link
Contributor

@Mergifyio rebase

@mergify
Copy link
Contributor Author

mergify bot commented Jun 7, 2021

Command rebase: failure

Base branch update has failed
Git reported the following error:

Rebasing (1/1)

error: could not apply 56599d1... fix(crds/meshconfig): remove envoy image pattern

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 56599d1... fix(crds/meshconfig): remove envoy image pattern
Auto-merging charts/osm/crds/meshconfig.yaml
CONFLICT (content): Merge conflict in charts/osm/crds/meshconfig.yaml


err-code: 539C2

Copy link
Member

@shashankram shashankram left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR should use the Squash and merge option.

@shashankram shashankram merged commit a0decfd into release-v0.9 Jun 7, 2021
@shashankram shashankram deleted the mergify/bp/release-v0.9/pr-3524 branch June 7, 2021 20:07
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants