[#42145] - [5.1] upmerges 2023-10-16
- Closed
- 16 Oct 2023
- Medium
- Build: 5.1-dev
- # 42145
- Diff
- LadySolveig:5.1/upmerges/2023-10-16
User tests: Successful: Unsuccessful:
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
| Status | New | ⇒ | Pending |
joomla-cms-bot
- | Category | ⇒ | Repository JavaScript Administration com_media NPM Change Language & Strings Installation Libraries |
| Title |
|
||||||
| Status | Pending | ⇒ | Closed |
| Closed_Date | 0000-00-00 00:00:00 | ⇒ | 2023-10-16 19:55:25 |
| Closed_By | ⇒ | LadySolveig | |
| Labels |
Added:
Language Change
NPM Resource Changed
PR-5.1-dev
|
||
@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.
No need for sorry. That green button is really a tricky thing.
@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.