github / github/gh-stack

Keep on getting `invalid changes in the merge commit`

未关闭
#511 0 条评论 0 个 reaction 已指派 0 人 在 GitHub 查看
主要语言
Go
星标
1.5k
派生
70
平均合并
1 天 8 小时
30 天内合并 PR
7

描述

In github.com/lemonade-sdk/lemonade we use squash merging and also use a merge queue. In experimenting with stacks we keep running into this situation:

Image

Pretty much we queue up the entire stack, one layer merges and the rest are pulled. So then we have to monitor the next layer, requeue all of them etc.

The entire stack that showed this problem is here:
https://github.com/lemonade-sdk/lemonade/pull/3584

You can see the earlier layers how many times they got pulled out of the merge queue because of "invalid changes in the merge commit".

贡献指南

打开贡献指南

调研方向

Start by reproducing the stacked-PR scenario described with the linked lemonade pull request and examine how gh-stack interacts with GitHub's merge queue. Done means a queued stack can advance after one layer merges without later layers being repeatedly removed for "invalid changes in the merge commit."

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

评估

技术栈
github, go
领域
cli, devtools
Issue 类型
缺陷
难度
4/5
预计耗时
3-5 天
活跃度
活跃
描述清晰度
基本清楚
新手友好度
45/100

把新 issue 发到你的邮箱

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