Add --rebase-on-conflict flag to `gh stack sync` to auto-run rebase on conflicts
@skarim is already working on this.
Since Aug 11, 2026.
Assessment
This issue has not been assessed yet.
Description
Summary
Add a flag to gh stack sync so that when a conflict is detected it automatically runs gh stack rebase (instead of instructing the user to run rebase manually).
Background / motivation
Currently when users run gh stack sync and it encounters a conflict the CLI prints an instruction to run gh stack rebase. Some users would prefer a single-command flow that attempts a rebase automatically when a conflict occurs to avoid typing two commands.
Proposed behavior
- Add an explicit flag to
gh stack sync, for example--rebase-on-conflict(alternative names:--rebase-if-conflict,--auto-rebase). - Default behavior of
gh stack syncremains unchanged (safe, no automatic rebase). - When the flag is provided and sync detects a conflict,
gh stack syncshould automatically invoke the rebase flow (equivalent to runninggh stack rebase). - The flag signals that the user consents to the potential rebase-related outcomes (e.g., temporary detached HEAD during an in-progress rebase), so the command can proceed without an additional prompt.
- The command should preserve non-interactive behavior where appropriate (i.e., suitable for scripts). If prompts are required during rebase, consider a complementary
--yesor--no-interactiveoption, or clearly document the interaction expectations.
Acceptance criteria
gh stack sync --rebase-on-conflictwill run a rebase automatically if a conflict is encountered during sync.- The default
gh stack syncremains unchanged and does not perform automatic rebases. - Documentation for
gh stack syncincludes the new flag and describes its behavior and risks.
Example
- Normal:
gh stack sync - With flag:
gh stack sync --rebase-on-conflict
Notes / implementation hints
- Consider the exact flag name and whether a short alias (e.g.,
-r) is appropriate. - Ensure the UX communicates that the user opted in to automatic rebase behavior and any potential consequences.
- Make sure the behavior is deterministic for CI/automation usage (document or provide an explicit non-interactive mode).
- Dominant language
- Go
- Stars
- 1.5k
- Forks
- 73
- Avg merge
- 1d 8h
- Merged PRs (30d)
- 7
Contributor guide
First steps
- Read the whole issue, then the project's contributing guide.
- Comment on the issue to say you are picking it up — it saves two people doing the same work.
- Fork the repository and make your change on a branch.
- Open a pull request that references the issue number.
More from github/gh-stack
-
Difficulty 2/5 1-3 hours Newbie friendliness 85/100
-
Difficulty 1/5 Under an hour Newbie friendliness 92/100
-
feature request topic: cli - general
Difficulty 2/5 1-3 hours Newbie friendliness 68/100
-
feature request topic: auto-merge
Difficulty 2/5 1-3 hours Newbie friendliness 68/100
-
bug topic: docs
Difficulty 1/5 Under an hour Newbie friendliness 68/100
Similar issues
-
Difficulty 2/5 1-3 hours Newbie friendliness 88/100
NVIDIA/gpu-operator#2955 ·
-
agentic-workflows
Difficulty 2/5 1-3 hours Newbie friendliness 68/100
-
Difficulty 1/5 Under an hour Newbie friendliness 90/100
kovidgoyal/kitty#10516 ·
-
bug
Difficulty 1/5 Under an hour Newbie friendliness 90/100
cisagov/vulnrichment#337 ·
-
Difficulty 1/5 Under an hour Newbie friendliness 72/100