Skip to content

Remove overlapping constraints#850

Merged
localheinz merged 1 commit intoergebnis:mainfrom
fredden:remove-overlapping
Feb 25, 2023
Merged

Remove overlapping constraints#850
localheinz merged 1 commit intoergebnis:mainfrom
fredden:remove-overlapping

Conversation

@fredden
Copy link
Copy Markdown
Contributor

@fredden fredden commented Feb 21, 2023

This pull request is a small part of #756. This change seems less controversial than some of the other changes being suggested in #756.

  • overlapping constraints are removed (^1.0 || ^1.1 || ^2.0 -> ^1.0 || ^2.0)

Related to #756

@codecov
Copy link
Copy Markdown

codecov bot commented Feb 21, 2023

Codecov Report

Merging #850 (6ca24ce) into main (59080e1) will increase coverage by 0.04%.
The diff coverage is 100.00%.

@@             Coverage Diff              @@
##               main     #850      +/-   ##
============================================
+ Coverage     98.08%   98.13%   +0.04%     
- Complexity      139      144       +5     
============================================
  Files            28       28              
  Lines           627      643      +16     
============================================
+ Hits            615      631      +16     
  Misses           12       12              
Impacted Files Coverage Δ
...rc/Vendor/Composer/VersionConstraintNormalizer.php 98.98% <100.00%> (+0.19%) ⬆️

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@localheinz localheinz self-assigned this Feb 23, 2023
@localheinz localheinz force-pushed the remove-overlapping branch 3 times, most recently from 5bcc327 to b1e8674 Compare February 24, 2023 17:19
@fredden
Copy link
Copy Markdown
Contributor Author

fredden commented Feb 24, 2023

@localheinz would you like me to rebase (and force-push) this to create a cleaner commit history?

@localheinz
Copy link
Copy Markdown
Member

@fredden

I am sorry for force-pushing into your branch!

I'll let you do what you need to do!

@fredden
Copy link
Copy Markdown
Contributor Author

fredden commented Feb 24, 2023

There's no need to apologise. I'm used to lots of merge commits in a branch / pull request, then a single squash-merge to put the feature / change into the main branch. It looks like you prefer to rebase and force-push, so I'll try to remember to use that method going forward.
You're welcome to continue (force-)pushing to this branch as you see fit. :)

Co-authored-by: Andreas Möller <am@localheinz.com>
Copy link
Copy Markdown
Member

@localheinz localheinz left a comment

Choose a reason for hiding this comment

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

👍

@localheinz localheinz merged commit 953bf83 into ergebnis:main Feb 25, 2023
@localheinz
Copy link
Copy Markdown
Member

Thank you, @fredden!

@fredden fredden deleted the remove-overlapping branch February 25, 2023 18:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants