Skip to content

Conversation

@kenjis
Copy link
Member

@kenjis kenjis commented Nov 10, 2022

To reduce psalm issues.

Before: 803 other issues found.
After: 684 681 other issues found.

iamsyh and others added 4 commits November 4, 2022 01:45
The current comment content does not match what the code is doing. Please feel free to clean up or let me know any suggestions.

Thank you!
Co-authored-by: kenjis <kenji.uui@gmail.com>
To reduce psalm issues.
@kenjis kenjis requested a review from MGatner November 16, 2022 01:28
@kenjis kenjis closed this Nov 19, 2022
@kenjis
Copy link
Member Author

kenjis commented Nov 19, 2022

Something went wrong with this PR.

I hit the merge button of this PR on GitHub, but I got a form to select my email address.
When I reloaded the PR page, it showed a conflict, so I rebased and force pushed it.
Then the PR was closed., and this PR was messed up.

But when I see the commit log of develop, this PR was merged.

@MGatner
Copy link
Member

MGatner commented Nov 19, 2022

Very odd! I've had something similar happen when I accidentally fork another PR off a feature branch, and if the second PR gets merged and then feature is rebased it can "go away". I'm not sure that is what happened here though looking at the weird vomit history of this PR.

End result appears good, so 🤷‍♂️

@paulbalandan
Copy link
Member

If this PR was used as base for another PR that got merged first, then this PR is deemed automatically merged. Just read it recently in Github docs.

@kenjis
Copy link
Member Author

kenjis commented Nov 20, 2022

This is not used as base for another PR.

It seems this PR was merged into develop, but I rebased this branch (with the develop already merged this) and force pushed. The last commit in this PR is Merge pull request codeigniter4#518 from kenjis/docs-remove-psalm-issues. #518 is this PR.

However, I'm still not sure what happened, but as a result, the develop branch looks fine.
Only this PR page is a mess though.

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.

5 participants