Graphite Community

CleanShot 2023-08-10 at 10.46.49@2x.png

CleanShot 2023-08-10 at 10.45.56@2x.png

I think it's because you did some manual interactive rebase operations in the middle – I don't think that our `continue` command is currently built to handle that case

I only did the manual operations after `continue` failed once

The only operation missing in the screenshots is editing the file that had the conflict, right before `git add .`

I think the empty "Unmerged files" section is a bug with us not detecting a certain type of change

Thanks for reporting — I'll try to reproduce

CleanShot 2023-08-10 at 10.50.47@2x.png

I thought so too; so I tried `git status` after the failure but I didn't really understand the output. Cropped screenshot of that part here

It's my first time seeing git suggest the `--edit-todo` and `--amend` during a rebase. I vaguely remember it usually just has you `git commit` and `git rebase --continue`? though it's been a while since I rebased without graphite

CleanShot 2023-08-11 at 11.30.16@2x.png

CleanShot 2023-08-11 at 11.31.04@2x.png

here's my status before doing anything else

what was the last command you ran before reaching this state?

just to make sure i understand the full context

CleanShot 2023-08-11 at 11.40.45@2x.png

(ignore the first command, I ctrl-c'd it)