Track interactive PR #2086

未关闭
  • 哪里不对？
#2,090 1 条评论 0 个 reaction 已指派 0 人 在 GitHub 查看

维护者通常 1 天内回复

还没有人认领这个 Issue。

  • #2086 来自 @superdav42 —— 已关闭，未合并

评估

难度
4/5
预计耗时
3-5 天
新手友好度
1/100
Issue 类型
功能
描述清晰度
描述清楚
活跃度
停滞
技术栈
php, wordpress
领域
backend

调研方向

Start with the linked pull request #2086 and inspect its exact-head CI and review feedback, as the issue directs. The requested work is to complete that existing PR through its review and merge gates, preserving its commits and repairing only evidenced failures across the listed files. This issue says linkage is still awaiting verification, so work is not ready to start independently.

由索引模型根据 Issue 内容生成。

描述

origin:worker source:conflict-feedback status:available

Outcome

Complete existing interactive PR https://github.com/Ultimate-Multisite/ultimate-multisite/pull/2086 through its existing CI, review and merge gates. Preserve its commits; repair only evidenced failures.

Files Scope
  • DESIGN.md
  • inc/admin-pages/class-payment-edit-admin-page.php
  • inc/class-current.php
  • inc/gateways/class-base-stripe-gateway.php
  • inc/gateways/class-manual-gateway.php
  • inc/ui/class-account-summary-element.php
  • inc/ui/class-current-site-element.php
  • inc/ui/class-payment-methods-element.php
  • inc/ui/class-site-actions-element.php
  • inc/ui/class-template-switching-element.php
  • tests/WP_Ultimo/Current_Test.php
  • views/dashboard-widgets/account-summary-empty.php
  • views/dashboard-widgets/account-summary.php
  • views/dashboard-widgets/current-site.php
  • views/shortcodes/shortcodes.php
Verification

Use the existing checks and verification documented on the source PR; inspect its exact-head CI and review feedback before repair. Do not bypass approval or security gates.

Recovery state

Initially blocked pending verified PR linkage. Pulse owns linkage recovery; after verification, existing feedback routing transitions this issue to available when repair is needed. No independent dispatch before that transition.

aidevops.sh v3.39.119 automated scan.

Merge Conflict Feedback (from PR #2086)

The previous worker's PR #2086 (fix: complete frontend customer account and site management) developed merge conflicts with
main that could not be resolved by gh pr update-branch (server-side fast-forward).
The conflicts are semantic — the same files were modified on both branches (19 files touched).

Files in the conflicting PR
DESIGN.md
inc/admin-pages/class-payment-edit-admin-page.php
inc/builders/block-editor/assets/js/blocks.js
inc/builders/block-editor/assets/js/blocks.min.js
inc/builders/block-editor/class-block-editor-widget-manager.php
inc/class-current.php
inc/gateways/class-base-stripe-gateway.php
inc/gateways/class-manual-gateway.php
inc/ui/class-account-summary-element.php
inc/ui/class-base-element.php
inc/ui/class-current-site-element.php
inc/ui/class-payment-methods-element.php
inc/ui/class-site-actions-element.php
inc/ui/class-template-switching-element.php
tests/WP_Ultimo/Current_Test.php
views/dashboard-widgets/account-summary-empty.php
views/dashboard-widgets/account-summary.php
views/dashboard-widgets/current-site.php
views/shortcodes/shortcodes.php
Worker guidance

The prior PR's head commit is 0de65df0956706613369affd7f5f452c0d40e1ad. Choose the cheapest path that works:

  1. Cherry-pick onto a fresh branch off current origin/main (~10x cheaper than rewriting, works when the prior implementation was correct-but-stale):

    git fetch origin pull/2086/head:recovered-2086
# Explicit base on origin/main — NOT canonical HEAD (t2802).
git worktree add -b fresh-branch ../fresh-worktree origin/main
cd ../fresh-worktree
git cherry-pick 0de65df0956706613369affd7f5f452c0d40e1ad
# run tests — if clean, proceed to PR

  2. If cherry-pick surfaces conflicts, resolve them. The conflict surface IS the semantic overlap between the two branches — resolve those specific hunks rather than rewriting untouched logic.

  3. If the scope-leak warning above fired (prior PR >20 files but the issue describes a focused fix), skip cherry-pick entirely and rebuild from scratch using the issue body as the spec. Do NOT try to cherry-pick-then-drop-files — too error-prone. A clean rewrite from the 2-line spec is cheaper than surgery on a 100-file branch.

  4. Only rewrite from scratch (scope-OK case) if the prior approach was rejected in review. Check PR #2086's review comments for CHANGES_REQUESTED or rejection keywords before assuming the approach was wrong.

Do NOT reuse the old PR's branch directly — always cherry-pick onto a fresh branch off current origin/main.

Routed by deterministic merge pass (pulse-merge.sh).

主要语言
PHP
星标
218
派生
88
平均合并
1 天 5 小时
30 天内合并 PR
94

环境准备

  • 没有 Dockerfile 或 Docker Compose 文件
  • 没有 Pull Request 模板
  • 阅读贡献指南

从这里开始

  1. 先读完整个 Issue，再读项目的贡献指南。
  2. 在 Issue 下留言说明你要接手 —— 这能避免两个人做同样的事。
  3. Fork 仓库，在一个分支上完成修改。
  4. 提交 Pull Request，并在描述里引用这个 Issue 编号。

Ultimate-Multisite/ultimate-multisite 的其他 Issue

查看 Ultimate-Multisite/ultimate-multisite 的全部 Issue

相似的 Issue

更多 PHP Issue

把新 issue 发到你的邮箱

精选适合新手参与的 GitHub issue 摘要。