github / github/gh-stack

Keep on getting `invalid changes in the merge commit`

Aberta
#511 0 comentários 0 reações 0 responsáveis Ver no GitHub
Linguagem predominante
Go
Estrelas
1.5k
Forks
70
Merge médio
1d 8h
PRs com merge (30d)
7

Descrição

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

Guia de contribuição

Abrir o guia de contribuição

Direção de pesquisa

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

Escrita pelo modelo de indexação a partir do texto da issue.

Avaliação

Stack de tecnologia
github, go
Domínio
cli, devtools
Tipo de issue
Bug
Dificuldade
4/5
Tempo estimado
3-5 dias
Status de atividade
Ativa
Clareza
Razoavelmente clara
Facilidade para iniciantes
45/100

Receba novas issues na sua caixa de entrada

Um resumo curto de issues do GitHub para quem está começando.