[#39853] - Is https://github.com/joomla/joomla-cms/pull/39721 not merged correctly?
- Closed
- 19 Feb 2023
- Medium
- Build: 4.2-dev
- # 39853
Steps to reproduce the issue
Clone the branch 4.3-dev of this repo and open the file .gitignore.
Expected result
.gitignore should look like in #39721
Actual result
The text output is not there. See
Line 106 in c28c8e3
Although #39721 has been merged, it does not appear in the historie of the file .gitignore.
joomla-cms-bot
- | Labels |
Added:
No Code Attached Yet
|
||
@brianteeman why was this change reverted?
@astridx as you reverted it your self you have to decide which is the right one ;-) looking into the config file we use the output path
videosFolder: 'tests/cypress/output/videos',
screenshotsFolder: 'tests/cypress/output/screenshots',Can you please fix it again or did @laoneo see a valid reason why the .gitÃgnore has been changed in #39722 ?
I assume wrong merge conflict resolving @wojtekxtx.
@astridx can you create a new PR to bring back the correct configs please?
@fancyFranci Thanks for reply
Instead of creating new PR and messing up history, would not be easier to just git reset --hard to specific commit? Just thinking........
That won't work as all the clones are messed up then.
| Status | New | ⇒ | Closed |
| Closed_Date | 0000-00-00 00:00:00 | ⇒ | 2023-02-19 11:18:23 |
| Closed_By | ⇒ | astridx |
Your pull request #39722 was merged after #39721 and reverted the change