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

Add some F mount lenses (backport #2215) #2243

Merged
merged 1 commit into from
May 22, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 21, 2022

This is an automatic backport of pull request #2215 done by Mergify.
Cherry-pick of 707e22c has failed:

On branch mergify/bp/0.27-maintenance/pr-2215
Your branch is up to date with 'origin/0.27-maintenance'.

You are currently cherry-picking commit 707e22c5.
  (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/nikonmn_int.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.com

@mergify mergify bot added the conflicts label May 21, 2022
@mergify mergify bot mentioned this pull request May 21, 2022
@kmilos kmilos marked this pull request as draft May 21, 2022 14:22
(cherry picked from commit 707e22c)
@piponazo piponazo force-pushed the mergify/bp/0.27-maintenance/pr-2215 branch from b1d3d04 to d3e1e61 Compare May 22, 2022 13:11
@piponazo
Copy link
Collaborator

hi guys, I took the freedom to fix the merge conflicts in this branch

@codecov
Copy link

codecov bot commented May 22, 2022

Codecov Report

Merging #2243 (d3e1e61) into 0.27-maintenance (d6e39d6) will not change coverage.
The diff coverage is n/a.

@@                Coverage Diff                @@
##           0.27-maintenance    #2243   +/-   ##
=================================================
  Coverage             58.88%   58.88%           
=================================================
  Files                   149      149           
  Lines                 23208    23208           
  Branches              12716    12716           
=================================================
  Hits                  13666    13666           
  Misses                 6702     6702           
  Partials               2840     2840           
Impacted Files Coverage Δ
src/nikonmn_int.cpp 44.80% <ø> (ø)

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 d6e39d6...d3e1e61. Read the comment docs.

@kmilos
Copy link
Collaborator

kmilos commented May 22, 2022

Thanks a lot!

@kmilos kmilos marked this pull request as ready for review May 22, 2022 15:43
@kmilos kmilos added this to the v0.27.6 milestone May 22, 2022
@kmilos kmilos added lens Issue related to lens detection and removed conflicts labels May 22, 2022
@kmilos kmilos merged commit 0f1686f into 0.27-maintenance May 22, 2022
@mergify mergify bot deleted the mergify/bp/0.27-maintenance/pr-2215 branch May 22, 2022 18:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lens Issue related to lens detection
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants