github / github/gh-stack

Keep on getting `invalid changes in the merge commit`

Aperta
#511 0 commenti 0 reazioni 0 assegnatari Vedi su GitHub
Lingua principale
Go
Stelle
1.5k
Fork
70
Merge medio
1g 8h
PR unite (30g)
7

Descrizione

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

Guida per i contributori

Apri la guida per i contributori

Direzione di ricerca

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

Scritto dal modello di indicizzazione a partire dal testo della issue.

Valutazione

Stack tecnologico
github, go
Ambito
cli, devtools
Tipo di issue
Bug
Difficoltà
4/5
Tempo stimato
3-5 giorni
Stato di attività
Attiva
Chiarezza
Abbastanza chiara
Idoneità per principianti
45/100

Ricevi le nuove issue nella tua casella

Un breve riepilogo di issue GitHub adatte ai principianti.