Skip to content

Release merge conflict #4437

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Closed
wants to merge 10 commits into from
Closed

Release merge conflict #4437

wants to merge 10 commits into from

Conversation

glo82145
Copy link
Collaborator

@glo82145 glo82145 commented Mar 4, 2025

Description

TODO: Describe your changes in detail here.

Related Issue

Closes #ISSUE_NUMBER.

Acceptance

Verification Stakeholders

Specification

Verification Steps

Test scenario(s) for direct fix/feature

Test scenario(s) for any existing impacted features/areas

Test scenario(s) for any Magento Backend Supported Configurations

Is Browser/Device testing needed?

Any ad-hoc/edge case scenarios that need to be considered?

Screenshots / Screen Captures (if appropriate)

Breaking Changes (if any)

Checklist

  • I have added tests to cover my changes, if necessary.
  • I have added translations for new strings, if necessary.
  • I have updated the documentation accordingly, if necessary.

del22123 and others added 10 commits February 20, 2025 12:53
@del22123
Fixed unique id,aria-label and disabled attribute warnings (#4395)
52a4f1a
@glo82145
Removed npm yml
6532686
@glo82145
Merge branch 'release/14.2.0'
59d1fce
@del15881
Fixing the searchPage Issue : setFilterOptions is not a function. (#4430
3c70775 
)
@glo82145
Release notes/14.2.0 (#4429)
c3cb0c5 
* Removed npm yml

* added release notes

* added release notes

* PWA-14.2.0- Changed log
@devops-pwa-codebuild
v14.2.0-beta.6
8ebd1e4
@glo82145 @glo42707
@magento-github-admin-beta @devops-pwa-codebuild
Merge conflict (#4433)
a0ad6e1 
* adding release 14.1.0 change.log md

* adding compatibility.js

* Removed npm yml

* v14.2.0

* v14.2.0

---------

Co-authored-by: arpit.khare <glo42707@adobe.com>
Co-authored-by: magento-github-admin-beta <119524626+magento-github-admin-beta@users.noreply.github.com>
Co-authored-by: devops-pwa-codebuild <magento-devops-github-pwa-int@adobe.com>
@devops-pwa-codebuild
v14.2.0-beta.7
f954afe
@glo82145
Merge remote-tracking branch 'origin/release/14.2.0'
497ca32
@glo82145
Merge remote-tracking branch 'origin' into release_merge_conflict
30792b2
@glo82145 glo82145 changed the base branch from release/14.2.0 to main March 4, 2025 11:28
@pwa-studio-bot
Copy link
Collaborator

Fails
🚫

Whoops! Pull requests should be opened against develop, not main. Please reopen this PR against the correct branch.
🚫 A version label is required. A maintainer must add one.
🚫

No linked issue found. Please link a relevant open issue by adding the text "closes #<issue_number>" or "closes JIRA-<issue_number>" in your PR.
🚫 Missing information in PR. Please fill out the "Description" section.
Warnings
⚠️ Found the word "TODO" in the PR description. Just letting you know incase you forgot :)
Messages
📖 DangerCI Failures related to missing labels/description/linked issues/etc will persist until the next push or next pr-test build run (assuming they are fixed).
📖

Access a deployed version of this PR here. Make sure to wait for the "pwa-pull-request-deploy" job to complete.

If your PR is missing information, check against the original template here. At a minimum you must have the section headers from the template and provide some information in each section.

Generated by 🚫 dangerJS against 30792b2

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
pkg:create-pwa pkg:extensions pkg:pagebuilder pkg:peregrine pkg:pwa-buildpack pkg:venia-concept pkg:venia-ui
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@glo82145 @pwa-studio-bot @del22123 @del15881 @devops-pwa-codebuild