[#46437] - [6.0] Upmerges - 2025-11-11
- Fixed in Code Base
- 11 Nov 2025
- Medium
- Build: 6.0-dev
- # 46437
- Diff
- Bodge-IT:upmerges/2025-11-11
User tests: Successful: Unsuccessful:
| Status | New | ⇒ | Pending |
| Category | ⇒ | Administration com_finder com_media com_users Modules Templates (admin) Front End com_contact Installation Language & Strings JavaScript Layout Libraries NPM Change Plugins Templates (site) |
Please revert the change in the package-lock-json file. It should not be merged up but be kept like it is on 6.0-dev now, and I told you that before. Your "conflict resolution" here results in a duplicate "node_modules/@zone-eu/mailsplit" entry:
Lines 5442 to 5465 in 882f635
@richard67 beat me to writing the same thing
To correct myself: The duplicate line did not come from a wrong conflict resolution. Git did not have any conflict at that place. So it needs to either ignore the complete file for the upmerge, or to revert it with an additional commit afterwards.
So not really a mistake by @Bodge-IT , we have to review our upmerge procedure for these cases.
either way its probably best practice NOT to upmerge between branches the composer or npm files and locks
either way its probably best practice NOT to upmerge between branches the composer or npm files and locks
Yes, that's right. We upmerged them when we did the composer and npm updates for the first time.
After that, we have done the updates in 6.0-dev which we could not to in 5.4-dev due to semantic versioning.
Since that time composer and npm dependencies differ between 5.4-dev and 6.0-dev, and I made separate PRs for the 2 branches for updates.
That makes upmerges easier on the command line where you can ignore or revert complete files before the final merge commit.
But when using a GUI (GitHub desktop or any IDE), it works different. Those always do the final merge commit as soon as you have resolved any conflicts, and that means you need an additional commit to revert complete files to the previous state.
| Labels |
Added:
Test instructions missing
Language Change
NPM Resource Changed
PR-6.0-dev
|
||
| Category | Administration com_finder com_media com_users Modules Templates (admin) Front End com_contact Installation Language & Strings JavaScript Layout Libraries NPM Change Plugins Templates (site) | ⇒ | Administration com_finder com_media com_users Modules Templates (admin) Front End com_contact Installation Language & Strings JavaScript Layout Libraries Plugins Templates (site) |
| Labels |
Removed:
NPM Resource Changed
|
||
Thanks for diligence and comments. We were warned to watch out for the issue but ide offered no conflicts and it got through. I've reverted it now and picked up the additional PR merged by @richard67, so all's well that ends well.
| Category | Administration com_finder com_media com_users Modules Templates (admin) Front End com_contact Installation Language & Strings JavaScript Layout Libraries Plugins Templates (site) | ⇒ | Administration com_finder com_media com_users Modules Templates (admin) Front End com_contact Installation JavaScript Layout Libraries Plugins Templates (site) |
| Status | Pending | ⇒ | Fixed in Code Base |
| Closed_Date | 0000-00-00 00:00:00 | ⇒ | 2025-11-11 13:54:25 |
| Closed_By | ⇒ | Bodge-IT | |
| Labels |
Removed:
Language Change
|
||
Thanks for the support on this one @brianteeman & @richard67
Please add more information to your issue. Without test instructions and/or any description we will close this issue within 4 weeks. Thanks.
This is an automated message from the J!Tracker Application.