Skip to content

Conversation

herndlm
Copy link
Contributor

@herndlm herndlm commented Oct 10, 2022

pretty sure this will conflict with my other PR in at least one file, but I'll just fix that when the time comes

@herndlm herndlm force-pushed the key-first-last branch 2 times, most recently from 3c5f52e to 7882270 Compare October 10, 2022 19:43
@herndlm herndlm marked this pull request as ready for review October 10, 2022 19:50
@ondrejmirtes
Copy link
Member

This one should be rebased now. In the future it'd make sense to only send one PR at a time - you'll always apply learnings from the earlier PRs in the later PRs. It's my preferred workflow.

@herndlm
Copy link
Contributor Author

herndlm commented Oct 11, 2022

This one should be rebased now. In the future it'd make sense to only send one PR at a time - you'll always apply learnings from the earlier PRs in the later PRs. It's my preferred workflow.

yeah, I definitely agree and also normally work like that. in this case the motivation took over. but I stopped after the first one since I knew it would end in rebase hell :D

@ondrejmirtes ondrejmirtes merged commit 82f1aec into phpstan:1.9.x Oct 11, 2022
@ondrejmirtes
Copy link
Member

Thank you!

@herndlm herndlm deleted the key-first-last branch October 11, 2022 14:02
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.

2 participants