github / github/gh-stack

Keep on getting `invalid changes in the merge commit`

Ouverte
#511 0 commentaires 0 réactions 0 personnes assignées Voir sur GitHub
Langage dominant
Go
Étoiles
1.5k
Forks
70
Merge moyen
1 j 8 h
PR mergées (30 j)
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".

Guide de contribution

Ouvrir le guide de contribution

Piste de recherche

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

Rédigé par le modèle d'indexation à partir du texte de l'issue.

Évaluation

Stack technique
github, go
Domaine
cli, devtools
Type d'issue
Bug
Difficulté
4/5
Temps estimé
3-5 jours
Activité
Active
Clarté
Plutôt claire
Accessibilité débutants
45/100

Recevez les nouvelles issues par e-mail

Un résumé court des issues GitHub adaptées aux débutants.