abhinav / abhinav/git-spice

Better handling of restack conflicts being resolved externally

Abierto
#622 1 comentario 2 reacciones 0 asignados Ver en GitHub
enhancement
Lenguaje dominante
Go
Estrellas
762
Forks
72
Merge medio
18 h 24 min
PR fusionados (30 d)
28

Descripción

If I perform an operation like:
`gs upstack onto `

and there are conflicts with performing that operation, I can go and resolve those conflicts to continue the operation.

However, I usually use my IntelliJ IDE to resolve conflicts, and in doing so the IDE automatically calls `git rebase --continue` behind the scenes. Eventually the rebase is finished. However, it seems like git spice is not able to track this, so I end up in a state where the actual commits on the branch I was moving are correct, but git spice still has the wrong "parent" tracked. Calling `gs rebase continue` doesn't work because it just errors out with "no rebase is happening"

Is there a way for `gs rebase continue` to basically proceed with the original operation that was happening if it detects that the rebase it was doing was completed outside the `gs` flow, so it knows it can proceed with reparenting the branch?

Guía de contribución

Abrir la guía de contribución

Evaluación

Este issue todavía no se ha evaluado.

Recibe los nuevos issues en tu correo

Un resumen breve de issues de GitHub para principiantes.