Feeling Lucky
?
[#33478] - [4.0] Fix merge conflict remainder from upmerge from 3.10-dev
- Fixed in Code Base
- 1 May 2021
- Medium
- Build: 4.0-dev
- # 33478
- Diff
- richard67:4.0-dev-fix-merge-conflict-remainder-2021-01-02
User tests: Successful: Unsuccessful:
Pull Request for Issue # .
Summary of Changes
The recent upmerge from 3.10-dev (commit 964d90f ) left a remainder from a merge conflict here:
964d90f#diff-617530abeea53181b5e5f641ba3906dcbf758238861e8a5281422722533d8532R1415-R1416
This comes from PR #29480 having been merged in 4.0-dev before. With that PR, function isNonCoreExtension has ben removed since it's not used anymore. This is still true after the upmerge, but the function came back. That's why this not only removes the
Testing Instructions
- Code review.
- Check if PHPCS passes in drone.
- Check if the pre-update checker works on current 4.0-dev without and with the PR.
Actual result BEFORE applying this Pull Request
- Code contains a remainder from a merge conflict.
- PHPCS fails in drone.
Expected result AFTER applying this Pull Request
- Code doesn't contain a remainder from a merge conflict.
- PHPCS passes in drone.
Pre-update check still works.
Documentation Changes Required
None.
| Status | New | ⇒ | Pending |
joomla-cms-bot
- | Category | ⇒ | Administration com_joomlaupdate |
| Status | Pending | ⇒ | Fixed in Code Base |
| Closed_Date | 0000-00-00 00:00:00 | ⇒ | 2021-05-01 23:30:09 |
| Closed_By | ⇒ | wilsonge | |
| Labels |
Added:
?
|
||
richard67
- comment
- 1 May 2021
I was still writing testing instructions when you merged
Thanks!