github-tools / github-tools/github

Web editor fails to open when trying to resolve merge conflicts

未关闭
#764 0 条评论 0 个 reaction 已指派 0 人 在 GitHub 查看
主要语言
JavaScript
星标
3.8k
派生
809
PR 合并指标
30 天内没有已合并 PR

描述

Image
Image

I am unable to use the GitHub web editor to resolve merge conflicts on my remote branches. When I click “Resolve conflicts”, the page tries to load the editor but immediately redirects back to the previous page without opening anything.

This issue started about three days ago, after I enabled some branch protection rulesets. Before that, everything worked normally.

**Steps to reproduce:**

Go to a pull request with merge conflicts

Click `Resolve conflicts`

Page flashes the editor for a moment

Redirects back to the PR page with no editor and no error message

**Expected behavior:**
The merge conflict editor should open normally so I can resolve conflicts directly in the browser.

Actual behavior:
The editor never loads. It redirects back instantly with no error message.

**Additional notes:**
– Issue persists across browsers
– Started happening only after enabling branch protection rulesets
– No changes were made to repository permissions

Please advise if branch protection rules are blocking the web editor or if this is a bug.

贡献指南

这个仓库没有索引到贡献指南

调研方向

未识别源文件或测试。首先,在存在合并冲突的 pull request 上复现该故障,然后比较启用分支保护规则集前后在不同浏览器中的行为。完成的标准是 Resolve conflicts 操作能够正常打开 Web 编辑器,并允许在不发生重定向的情况下解决冲突。

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

评估

技术栈
github, javascript
领域
frontend, web-dev
Issue 类型
缺陷
难度
4/5
预计耗时
3-5 天
活跃度
停滞
描述清晰度
基本清楚
新手友好度
25/100

把新 issue 发到你的邮箱

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