[5.1] upmerges 2023-10-16

[LadySolveig]

Pull Request for Issue # .

Summary of Changes

Testing Instructions

Actual result BEFORE applying this Pull Request

Expected result AFTER applying this Pull Request

Link to documentations

Please select:

• Documentation link for docs.joomla.org:

• No documentation changes for docs.joomla.org needed

• Pull Request link for manual.joomla.org:

• No documentation changes for manual.joomla.org needed

[richard67]

@LadySolveig You should not use s quash commit but a merge commit, otherwise the change history for the single commits from 5.0-dev will get lost. The GitHub UI is a bit tricky. The green button remembers what you have used last time, squash or merge, so if you come from daily maintainer work with merging PRs, which is done with squash, and then want to merge up branches, which has to be done with merge, you have to toggle the commit type with the dropdown of the green merge button before merging.

[richard67]

P.S.: I also can't see the changes from this PR in the changes here, so the upmerge here is either outdated or there is something else wrong: #42103 .

[LadySolveig]

@LadySolveig You should not use s quash commit but a merge commit, otherwise the change history for the single commits from 5.0-dev will get lost. The GitHub UI is a bit tricky. The green button remembers what you have used last time, squash or merge, so if you come from daily maintainer work with merging PRs, which is done with squash, and then want to merge up branches, which has to be done with merge, you have to toggle the commit type with the dropdown of the green merge button before merging.

Absolutly right, sorry I forgot to change after editing the title.

[richard67]

No need for sorry. That green button is really a tricky thing.

[LadySolveig]

P.S.: I also can't see the changes from this PR in the changes here, so the upmerge here is either outdated or there is something else wrong: #42103 .

#42146
I don't know what I've done - now the PR is there. Thank you!

[richard67]

#42146 looks good, all right.