Fix kwargs.pop() with conflicting defaults not setting the conditional default

[mauvilsa]

What does this PR do?

Fixes #362

Before submitting

• Did you read the contributing guideline?
• Did you update the documentation? (readme and public docstrings)
• Did you write unit tests such that there is 100% coverage on related code? (required for bug fixes and new features)
• Did you verify that new and existing tests pass locally?
• Did you make sure that all changes preserve backward compatibility?
• Did you update the CHANGELOG? (not for typos, docs, test updates, or minor internal changes/refactors)

[codecov]

Codecov Report

Patch coverage: 100.00% and no project coverage change.

Comparison is base (cd165e9) 100.00% compared to head (a4363e0) 100.00%.

Additional details and impacted files

@@            Coverage Diff            @@
##              main      #364   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files           21        21           
  Lines         5715      5715           
=========================================
  Hits          5715      5715           

Flag	Coverage Δ
py3.10	87.62% <100.00%> (ø)
py3.10_all	98.84% <100.00%> (ø)
py3.10_types	98.84% <100.00%> (ø)
py3.11	87.61% <100.00%> (ø)
py3.11_all	98.82% <100.00%> (ø)
py3.11_types	98.82% <100.00%> (ø)
py3.6	85.06% <100.00%> (+0.07%)	⬆️
py3.6_all	96.64% <100.00%> (+0.01%)	⬆️
py3.7	88.15% <100.00%> (ø)
py3.7_all	99.52% <100.00%> (ø)
py3.7_types	99.50% <100.00%> (ø)
py3.8	88.32% <100.00%> (ø)
py3.8_all	99.59% <100.00%> (ø)
py3.8_types	99.58% <100.00%> (ø)
py3.9	88.18% <100.00%> (ø)
py3.9_all	99.49% <100.00%> (ø)
py3.9_types	99.49% <100.00%> (ø)

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

Files Changed	Coverage Δ
jsonargparse/_parameter_resolvers.py	100.00% <100.00%> (ø)

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

[sonarcloud]

Kudos, SonarCloud Quality Gate passed!   

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

No Coverage information
0.0% Duplication