How best to apply a PR and include a changelog entry

[Christopher Schultz <ch...@christopherschultz.net>]

All,

I'd like to accept a PR and also include a changelog entry at the same 
time, in a single commit. Is that possible and/or easy?

Thanks,
-chris

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org

Re: How best to apply a PR and include a changelog entry

[Mark Thomas <ma...@apache.org>]

On 16/03/2022 16:28, Christopher Schultz wrote:
> All,
> 
> I'd like to accept a PR and also include a changelog entry at the same 
> time, in a single commit. Is that possible and/or easy?

You can but it involves some hoop jumping.

Roughly:
- start in your local checkout
- git checkout -b sim-lus-patch-1 main
- git pull https://github.com/sim-lus/tomcat.git patch-1
- cherry pick the commit to main
- make the changelog changes and commit them
- git rebase -i HEAD~2
- squash the changelog commit into the PR commit
- git push

Git being git, there are probably multiple ways of doing this.

Mark

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org