github / github/gh-stack

Keep on getting `invalid changes in the merge commit`

Open
#511 0 comments 0 reactions 0 assignees View on GitHub
Dominant language
Go
Stars
1.5k
Forks
70
Avg merge
1d 8h
Merged PRs (30d)
7

Description

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".

Contributor guide

Open the contributing guide

Research direction

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."

Written by the indexing model from the issue text.

Assessment

Tech stack
github, go
Domain
cli, devtools
Issue type
Bug
Difficulty
4/5
Estimated time
3-5 days
Activity status
Active
Clarity
Mostly clear
Newbie friendliness
45/100

Get new issues in your inbox

A short digest of beginner-friendly GitHub issues.