Skip to content

Conversation

@howard-e
Copy link
Contributor

No description provided.

@netlify
Copy link

netlify bot commented Dec 19, 2024

Deploy Preview for aria-practices ready!

Name Link
🔨 Latest commit 38246f8
🔍 Latest deploy log https://app.netlify.com/sites/aria-practices/deploys/6764490ac00109000835ca94
😎 Deploy Preview https://deploy-preview-375--aria-practices.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@howard-e
Copy link
Contributor Author

Related to #373 & #374. Will merge for expediency as unable to replicate failure case in forks.

@howard-e howard-e merged commit 299a10e into main Dec 19, 2024
4 checks passed
@howard-e
Copy link
Contributor Author

This issue is now resolved

@remibetin remibetin deleted the pr-create-handle-submodule-conflicts branch February 14, 2025 13:56
remibetin added a commit that referenced this pull request Mar 19, 2025
* Update `APG` to `WAI` pipeline workflows to handle desync issues and better reports on errors (#361)

* Fix #219
* Update 'deploy.yml' to use 'w3cgruntbot' as committer
* Update 'pr-create.yml' to force a rebase to happen with main in the case generated branch doesn't have relevant changes; additional error handling coverage with 'create-pr' script
* For consistency, rename 'create-pr' script to 'pr-create'
* Remove unnecessary delete branch action

* Infrastructure: Add case to specially handle conflicts in submodule folder to `pr-create.yml` (#373)

* Add case to specially handle conflicts in submodule folder

* Additional pr-create.yml workflow changes to support submodule conflict resolution (#374)

* Infrastructure: Disable git editor during `git rebase --continue` in `pr-create.yml` (#375)

* Update transformPattern.js to support "patterns/landmarks" (#382)

* Pin ruby 3.3.3 instead of 3.3.x during workflow builds (#384)

* chore: Update `main` with latest changes from `aria-practices`

* Remove use of ytkey (deprecated) (#370)

* Infrastructure: Create `.tracked-html-assets.json`  (#388)

* Create .tracked-html-assets.json to make it easier to account for html assets which don't match with the expected html assets' naming structure

* chore: Update `main` with latest changes from `aria-practices`

* chore: Update `main` with latest changes from `aria-practices`

* chore: Update `main` with latest changes from `aria-practices`

* Update .tracked-html-assets.json (#395)

---------

Co-authored-by: w3cgruntbot <[email protected]>
Co-authored-by: Rémi Bétin <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants