Skip to content

Conversation

staabm
Copy link
Contributor

@staabm staabm commented Nov 29, 2024

2.0.x variant of #3692

@ondrejmirtes
Copy link
Member

After #3692 is merged, you need to do git merge origin/1.12.x locally, fix the conflicts and push the merge commit here.

@staabm staabm force-pushed the lazy-or branch 4 times, most recently from 9bebc23 to 7d1503d Compare November 30, 2024 07:04
@staabm staabm marked this pull request as ready for review November 30, 2024 07:09
@phpstan-bot
Copy link
Collaborator

This pull request has been marked as ready for review.

@staabm
Copy link
Contributor Author

staabm commented Nov 30, 2024

here we go

@ondrejmirtes ondrejmirtes merged commit 702b422 into phpstan:2.0.x Nov 30, 2024
424 of 427 checks passed
@ondrejmirtes
Copy link
Member

Thank you.

@staabm staabm deleted the lazy-or branch November 30, 2024 08:36
@ondrejmirtes
Copy link
Member

No, you didn't do what I meant :( I have to go back.

@ondrejmirtes
Copy link
Member

You should have merged 1.12.x which already contained your PR but you didn't do that.

@ondrejmirtes
Copy link
Member

This is what you did:

Screenshot 2024-11-30 at 14 06 32

The problem is that the merge conflict was not resolved. Your commit from 1.12.x was not in 2.0.x. When I did git merge origin/1.12.x, there was a conflict still.

This is what I meant:

Screenshot 2024-11-30 at 14 07 36

Please bear that in mind next time :) Thanks.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants