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

ENH Always merge-up commits even if files are identical #40

Merged

Conversation

emteknetnz
Copy link
Member

@emteknetnz emteknetnz commented Jun 17, 2024

Issue #39

Have tested merging up a pair of commits (Update ci.yml) where the 2nd reverted the 1st in this workflow run

GuySartorelli
GuySartorelli previously approved these changes Jun 17, 2024
Copy link
Member

@GuySartorelli GuySartorelli left a comment

Choose a reason for hiding this comment

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

LGTM Oops I immediately forgot about the change I'm requesting lol

action.yml Outdated Show resolved Hide resolved
@GuySartorelli GuySartorelli dismissed their stale review June 17, 2024 21:38

requested changes not approved. Oops.

@emteknetnz emteknetnz force-pushed the pulls/1.2/merge-commits branch from e1a4681 to 274b73a Compare June 17, 2024 22:15
Copy link
Member

@GuySartorelli GuySartorelli left a comment

Choose a reason for hiding this comment

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

LGTM

@GuySartorelli GuySartorelli merged commit d8e881f into silverstripe:1.2 Jun 17, 2024
4 checks passed
@GuySartorelli GuySartorelli deleted the pulls/1.2/merge-commits branch June 17, 2024 22:20
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