`gh stack rebase -i` - allow interactive rebasing
- Lenguaje dominante
- Go
- Estrellas
- 1.5k
- Forks
- 70
- Merge medio
- 1 d 8 h
- PR fusionados (30 d)
- 7
Descripción
Support `-i` for rebasing stacks.
I ❤️ rebasing, and doing no-edit amends. When I do that in a branch low in the stack, the higher layers end up with "duplicate-ish" commits that conflict. The solution during a normal rebase is to drop that new duplicate. Here's an example
### Initial State
branch-a
`main -> commitA (111aaa)`
branch-b
`main -> commitA (111aaa) -> commitB (222bbb)`
### Change in `branch-a` and `git commit --amend`'d
if I go to `branch-a` and make a change using `git commit --amend` I'll end up with this:
branch-a
`main -> commitA (112aaa)`
branch-b
`main -> commitA (111aaa) -> commitB (222bbb)`
### Finally, rebasing `branch-b`
Then when `branch-b` gets rebased, it looks like this:
`main -> commitA (112aaa) -> commitA (111aaa) -> commitB (222bbb)`
Again, the solution is simply to `drop` `commitA (111aaa)`, as that's the old one.
But I can't do that with `gh stack rebase`.
Guía de contribución
Línea de trabajo
Start at the `gh stack rebase` command and trace how its arguments are handled, then reproduce the stacked-branch example from the issue. The work is done when `gh stack rebase -i` launches interactive rebasing and allows the old duplicate commit to be dropped without producing the duplicate commit in the higher layer.
Escrito por el modelo de indexación a partir del texto del issue.
Evaluación
- Stack tecnológico
- git, go
- Área
- cli
- Tipo de issue
- Nueva funcionalidad
- Dificultad
- 4/5
- Tiempo estimado
- 3-5 días
- Estado de actividad
- Tranquilo
- Claridad
- Bastante claro
- Aptitud para principiantes
- 48/100