Pull Requests, Auto generated release notes and branch rebase

[cvergne]

Select Topic Area

Question

Body

Hi :)

I hope I am in the correct category.

I love the feature to automatically generate release notes based on merged pull requests.
Let say I have a branche release/v1.x which is the target of all my PRs, and then I will merge that branch into main.

In this case, releases notes are correctly generated.

But now, let say in between some other commits/PRs have been pushed to main, so I rebase my release/v1.x. In this specific case, the generated release notes are empty :(

Is there something to do to correctly having release notes generated after a rebase ? Even with --rebase-merges which keeps merge commits, release notes stay empty :/

Thanks !

[Armaritto]

Reasoning

This possibly happens as GitHub generate the release notes based on the merge commits.
on rebasing the merge history is rewritten so it cant recognize the rebased commits,

Possible Solutions

• Try using merge instead of rebase

git checkout release/v1.x
git merge main 

• Use github CLI by

1. Manually genenrate release notes

gh release create v1.x --notes-file <(git log --merges --pretty=format:"%h %s" main..release/v1.x)

2. Label PRs and use the github CLI auto_generate_notes feature

 gh release create v1.x --title "Release v1.x" --generate-notes

[cvergne]

Hi,
Thanks for you reply, but I'm rebasing precisely because I don't want a merge commit of main inside my branch. I want a linear history, including merge commits of PRs.
And unfortunately, even rebasing with the merge commits, the note releasing doesn't work.

And I'm looking for a way of making the feature from the UI working instead of using something else, without replacing the rebase use ^^'

[Armaritto]

Okk, i have searched and found a command that might help
use --empty=keep with --rebase-merges
git rebase --rebase-merges --empty=keep main