This message was deleted.

I'm not up-to-date on JetBrains, but I use the VSCode built-in merge conflict resolver. The main thing is to run

gt continue

instead of

git rebase --continue

because graphite restacks may include multiple rebases (one for each stacked branch) w.r.t. branch creation and commit creation — git UI will work (just like git commands), but you'll need to manually run the graphite

track

and

restack

operations that are handled for you automatically when using our first-class commands cc @Pranathi Peri — we might consider updating the documentation with more examples of the `gt`/`git` interplay to better answer questions like this