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

feat: better support for merge commits of all kinds #512

Merged
merged 8 commits into from
Sep 13, 2022
Merged

Conversation

maelle
Copy link
Member

@maelle maelle commented Aug 29, 2022

Fix #509
Fix #459

return(default_newsworthy[[1]])
}

if (commit_df$merge) {
Copy link
Member Author

Choose a reason for hiding this comment

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

This means always keeping the merge commit messages. At worst I suppose they're not too bad placeholders?

Copy link
Contributor

@krlmlr krlmlr left a comment

Choose a reason for hiding this comment

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

Thanks for looking into it!

@maelle maelle marked this pull request as ready for review September 13, 2022 05:51
@maelle maelle merged commit de73bc4 into main Sep 13, 2022
@maelle maelle deleted the mergecommits branch September 13, 2022 06:21
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 14, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Development

Successfully merging this pull request may close these issues.

Use git not a regex to identify merge commits Amend logic around merge commits
2 participants