Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebase selector modifiers #309

Merged

Conversation

verfriemelt-dot-org
Copy link
Contributor

rebased version of #289

Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
Signed-off-by: Nathanael Esayeas <nathanael.esayeas@protonmail.com>
@carlosas carlosas marked this pull request as ready for review January 5, 2025 16:57
@carlosas carlosas merged commit e89b43c into carlosas:master Jan 5, 2025
14 checks passed
@carlosas carlosas mentioned this pull request Jan 5, 2025
@carlosas
Copy link
Owner

carlosas commented Jan 5, 2025

Released with https://github.com/carlosas/phpat/releases/tag/0.11.2 🚀
Thank you @ghostwriter and @verfriemelt-dot-org

@verfriemelt-dot-org
Copy link
Contributor Author

@ghostwriter this was created to test against phpstan 2 in projects requiring it via

        "phpat/phpat": "dev-master#e89b43c984fe7b7a72f7c18defac9c78e57c3aae"

@carlosas
Copy link
Owner

carlosas commented Jan 6, 2025

Hey. Sorry if merging the v11 one instead of the v10 created some bad feelings regarding authorship.

Even the issue (and PR) were originally created for another user for v9.
Regarding this PR, I saw the commits with both users registered so I considered it was properly attributed.

@ghostwriter
Copy link
Contributor

I understand this wasn’t intentional,

GitHub is just a UI; the Git log in the master branch shows incomplete attribution due to the squash merge.

It's a great learning opportunity, and I appreciate the collaborative spirit we've shared.

Thank you for understanding and I appreciate the clarification.


GitHub: creating a commit with multiple authors

commit message

Co-authored-by: NAME <NAME@EXAMPLE.COM>
Co-authored-by: ANOTHER-NAME <ANOTHER-NAME@EXAMPLE.COM>

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