abhinav / abhinav/git-spice

Better handling of restack conflicts being resolved externally

未關閉
#622 1 則留言 2 個 reaction 已指派 0 人 在 GitHub 檢視
enhancement
主要語言
Go
星號
762
分支
72
平均合併
18 小時 24 分鐘
30 天內合併 PR
28

描述

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?

貢獻指南

開啟貢獻指南

評估

這個 Issue 還沒有評估資料。

把新 issue 寄到你的電子郵件信箱

精選適合新手參與的 GitHub issue 摘要。