Hacktoberfest 2026: le issue che i maintainer hanno segnato per ottobre, aperte e adatte ai principianti. Sfoglia le issue Hacktoberfest

`gh stack rebase` uses the wrong onto boundary for merged branches

Aperta
#512 0 commenti 0 reazioni 0 assegnatari Vedi su GitHub

Nessuno ha ancora preso questa issue.

Valutazione

Difficoltà
3/5
Tempo stimato
1-2 giorni
Idoneità per principianti
84/100
Tipo di issue
Bug
Chiarezza
Specificata chiaramente
Stato di attività
Attiva
Stack tecnologico
git, github, go
Ambito
cli

Direzione di ricerca

Start in internal/github/github.go and cmd/utils.go, then read cmd/rebase_test.go for the existing rebase boundary behavior. Run the rebase test and review the linked commit for the intended remote-versus-local SHA scenario. Done means the test covers local SHA A versus remote SHA B and gh stack rebase selects the remote merge point.

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

Descrizione

Problem: gh-stack needs to know "what was branch X's last commit right before it got merged" so it can skip replaying that history into upstack branches. Currently, it resolves this from the local clone instead of GitHub.

So, if branch X gets rebased elsewhere before merging, the local copy goes stale. That's normal and expected, however gh stack rebase fails to notice this and tries to replay from the wrong commit. This has led to spurious merge conflicts on files I didn't even touch, leading me to rebasing branches one-by-one or fixing the gh-stack state by hand (or with an agent).

Fix: I wrote a fix here. Full disclosure: I used Claude to write the fix but I manually reviewed and edited it afterwards.

I would open a PR for this but it's locked to contributors only.

Changes:

  1. internal/github/github.go: Add one field, HeadRefOid, to PullRequest. This tracks the remote's record of the exact commit which was merged.
  2. cmd/utils.go:
    • When a PR is detected as merged, save its HeadRefOid value.
    • When computing the rebase boundary, use HeadRefOid instead of getting the (possibly stale) local SHA through git.
  3. cmd/rebase_test.go: Add a test that fakes the problem scenario ("local has SHA A, but remote has SHA B (the real merge point)" and checks the tool picks B. This test fails without the above fixes, and passes with them.

Net effect: The onto boundary now comes from remote / GitHub (can't go stale) instead of local, eliminating confusing rebase conflicts due to a misconfigured rebase.

Lingua principale
Go
Stelle
1.5k
Fork
73
Merge medio
1g 8h
PR unite (30g)
7

Guida per i contributori

Apri la guida per i contributori

Come iniziare

  1. Leggi tutta la issue e poi la guida ai contributi del progetto.
  2. Commenta sulla issue per dire che te ne occupi tu — evita che due persone facciano lo stesso lavoro.
  3. Fai un fork del repository e lavora su un branch.
  4. Apri una pull request che faccia riferimento al numero della issue.

Altre issue di github/gh-stack

Tutte le issue di github/gh-stack

Issue simili

Altre issue su Go

Ricevi le nuove issue nella tua casella

Un breve riepilogo di issue GitHub adatte ai principianti.