Skip to content

Conversation

@github-actions
Copy link

@github-actions github-actions bot commented Sep 4, 2025

⚠️ Manual Resolution Required

    This cherry-pick of [#532](https://github.com/elementor/hello-theme/pull/532) to `3.4` branch has conflicts that need manual resolution.

    **Theme-Specific Conflict Resolution:**
    - **Version Conflicts**: Check `style.css` header for version mismatches
    - **Schema Conflicts**: Validate `theme.json` structure changes
    - **Function Conflicts**: Resolve `functions.php` function name collisions

    **Resolution Steps:**
    1. Check out this branch: `git checkout tmz-803-clone-release-workflow-cherry-pick-pr532-1756990692-conflicts`
    2. Resolve conflicts in the marked files
    3. Stage resolved files: `git add <resolved-files>`
    4. Amend the commit: `git commit --amend`
    5. Push changes: `git push --force-with-lease`
    6. Mark this PR as ready for review

    **Automatic Validation:**
    Once you push resolved changes, the following workflows will run automatically:
    - Build validation (`build.yml`)
    - JavaScript linting (`lint.yml`)
    - Cherry-pick validation (`cherry-pick-validation.yml`)
    - Additional CI workflows as configured

    **Original PR:** [#532](https://github.com/elementor/hello-theme/pull/532)
    **Trigger:** Label `cp_3.4` added to closed PR

@hein-obox hein-obox closed this Sep 4, 2025
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.

1 participant