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

Enforce BMFF box nesting (backport #1794) #1855

Merged
merged 10 commits into from
Aug 7, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 7, 2021

This is an automatic backport of pull request #1794 done by Mergify.
Cherry-pick of 8c64e9a has failed:

On branch mergify/bp/0.27-maintenance/pr-1794
Your branch is ahead of 'origin/0.27-maintenance' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 8c64e9ab.
  (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:   include/exiv2/bmffimage.hpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/bmffimage.cpp

Cherry-pick of 02d4ef2 has failed:

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

You are currently cherry-picking commit 02d4ef2c.
  (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:   include/exiv2/bmffimage.hpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/bmffimage.cpp

Cherry-pick of 78e9c8a has failed:

On branch mergify/bp/0.27-maintenance/pr-1794
Your branch is ahead of 'origin/0.27-maintenance' by 3 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 78e9c8aa.
  (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:   src/bmffimage.cpp

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 2d5cccd has failed:

On branch mergify/bp/0.27-maintenance/pr-1794
Your branch is ahead of 'origin/0.27-maintenance' by 4 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 2d5cccd4.
  (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:   fuzz/fuzz-read-print-write.cpp

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.io/

@mergify mergify bot added the conflicts label Aug 7, 2021
@mergify mergify bot mentioned this pull request Aug 7, 2021
@kevinbackhouse kevinbackhouse force-pushed the mergify/bp/0.27-maintenance/pr-1794 branch from eaeee3f to f3d4e47 Compare August 7, 2021 12:53
@kevinbackhouse kevinbackhouse added this to the v0.27.5 milestone Aug 7, 2021
@kevinbackhouse kevinbackhouse merged commit bfc65f8 into 0.27-maintenance Aug 7, 2021
@mergify mergify bot deleted the mergify/bp/0.27-maintenance/pr-1794 branch August 7, 2021 17:57
@clanmills clanmills mentioned this pull request Aug 9, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants