github / github/gh-stack

Feature request: support merge-based stack synchronization without force-pushing

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

Descrição

## Summary

Please add an option for stacked pull requests to synchronize branches using merge commits instead of rebasing and force-pushing branch history.

## Motivation

Our organization does not allow force-pushes because they rewrite branch history and can make audit trails, approvals, and incident investigation more difficult. The current "Rebase stack" workflow is therefore incompatible with our repository policies.

## Proposed behavior

Add a merge-based synchronization mode for stacks:

- When a parent branch changes, merge the parent into each child branch in stack order.
- Preserve existing commits and branch history.
- Do not force-push rewritten branch history.
- Keep the existing rebase behavior as the default or as a selectable repository/stack setting.
- Make the selected synchronization mode visible in the stack UI and CLI.
- Respect branch protection and merge-commit policies.

## Example

Given:

```text
main
└── feature-a
└── feature-b
```

When main advances, merge main into feature-a, then merge the updated feature-a into feature-b, instead of rebasing both branches and force-pushing them.

## Acceptance criteria

- A stack can be configured to use merge-based synchronization.
- Synchronizing the stack does not require force-pushing any branch.
- Existing approvals and checks are handled consistently with the merge-based history.
- Conflicts are reported per branch and can be resolved through the normal workflow.
- The behavior works with protected branches that block force-pushes.
- Existing rebase-based stacks continue to work unchanged.

## Related issues

- #268: Stacked PR cannot be merged into a merge-queue branch
- #442: gh stack sync pushed a stack branch's merge commit directly onto the trunk branch

Guia de contribuição

Abrir o guia de contribuição

Direção de pesquisa

Comece rastreando o workflow existente "Rebase stack" e o comando de sincronização do stack na CLI. Mapeie como as atualizações de branches, os Force-Pushes, os conflitos, as aprovações, os checks e as branches protegidas são tratados. O trabalho estará concluído quando um modo selecionável baseado em Merge sincronizar as branches na ordem do stack sem executar Force-Pushes, enquanto os stacks existentes baseados em Rebase continuarem funcionando.

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

Avaliação

Stack de tecnologia
git, github, go
Domínio
cli, devtools
Tipo de issue
Funcionalidade
Dificuldade
5/5
Tempo estimado
Mais de uma semana
Status de atividade
Pouca atividade
Clareza
Razoavelmente clara
Facilidade para iniciantes
35/100

Receba novas issues na sua caixa de entrada

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