Skip to content

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 28, 2022

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

On branch mergify/bp/main/pr-2167
Your branch is up to date with 'origin/main'.

You are currently cherry-picking commit 91643690.
  (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/makernote_int.cpp
	both modified:   src/makernote_int.hpp

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.com

@mergify mergify bot added the conflicts label Mar 28, 2022
@mergify mergify bot assigned kmilos Mar 28, 2022
@piponazo
Copy link
Collaborator

@kmilos It is normal that mergify fails to create successfully forward-PRs to main due to the large amount of changes introduced in main lately (specially the clang-format changes).

I guess that it is easier to do the "duplication" manually.

@kmilos
Copy link
Collaborator

kmilos commented Mar 28, 2022

Yep, looks like I'll have to do it manually...

@kmilos kmilos force-pushed the mergify/bp/main/pr-2167 branch from d10905b to 325a133 Compare March 30, 2022 08:54
@codecov
Copy link

codecov bot commented Mar 30, 2022

Codecov Report

Merging #2172 (44c3aab) into main (8f9b396) will increase coverage by 0.01%.
The diff coverage is 62.96%.

@@            Coverage Diff             @@
##             main    #2172      +/-   ##
==========================================
+ Coverage   63.29%   63.30%   +0.01%     
==========================================
  Files          99       99              
  Lines       19569    19596      +27     
  Branches     9554     9559       +5     
==========================================
+ Hits        12386    12406      +20     
- Misses       5112     5116       +4     
- Partials     2071     2074       +3     
Impacted Files Coverage Δ
src/makernote_int.cpp 64.88% <61.53%> (-0.18%) ⬇️
src/makernote_int.hpp 92.30% <100.00%> (+0.64%) ⬆️
src/olympusmn_int.cpp 38.38% <0.00%> (+1.05%) ⬆️

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 8f9b396...44c3aab. Read the comment docs.

@kmilos kmilos force-pushed the mergify/bp/main/pr-2167 branch from 325a133 to b515d3b Compare March 30, 2022 09:10
@kmilos kmilos force-pushed the mergify/bp/main/pr-2167 branch from b515d3b to 44c3aab Compare March 30, 2022 09:16
@kmilos
Copy link
Collaborator

kmilos commented Mar 30, 2022

Boy, is clang-format fussy or what!

@kmilos kmilos requested a review from piponazo March 30, 2022 09:56
@kmilos kmilos added enhancement feature / functionality enhancements makerNote Anything related to one of the various supported MakerNote formats and removed conflicts labels Mar 30, 2022
Copy link
Collaborator

@piponazo piponazo left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@piponazo piponazo merged commit 790fc46 into main Mar 31, 2022
@piponazo piponazo deleted the mergify/bp/main/pr-2167 branch March 31, 2022 06:49
@kmilos kmilos modified the milestone: v0.27.6 Jul 5, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

enhancement feature / functionality enhancements makerNote Anything related to one of the various supported MakerNote formats

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants