Skip to content
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.

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

[SITE-1585] address diffs after rebase #147

Merged
merged 2 commits into from
Jul 31, 2024
Merged

Conversation

jazzsequence
Copy link
Contributor

@jazzsequence jazzsequence commented Jul 31, 2024

This PR re-applies fixes from the backed-up copy of WPCM onto files that were changed the wrong way after the rebase.

While this PR doesn't actually address anything related to SITE-1585, rebasing the entire repository on the pantheon-upstreams repo, the "fix" was rebasing the repository on pantheon-usptreams/main and this fixes files that were adversely affected by the rebase (honestly surprising more didn't break).

@jazzsequence jazzsequence marked this pull request as ready for review July 31, 2024 16:19
@jazzsequence jazzsequence requested review from a team as code owners July 31, 2024 16:19
@jazzsequence jazzsequence changed the title address diffs after rebase [SITE-1585] address diffs after rebase Jul 31, 2024
composer.json Outdated Show resolved Hide resolved
@jazzsequence jazzsequence merged commit 1a38cd7 into default Jul 31, 2024
6 of 7 checks passed
@jazzsequence jazzsequence deleted the rebase-fix-diffs branch July 31, 2024 17:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants