Graphite Community

Ah, the merge commits are likely the issue here — if you stick to rebase-only updates this shouldn't be an issue

The "update branch" button on GitHub is somewhat counter to the workflow that the CLI expects and tries to resolve

Yeah, thought so. 

The only way to fix this would be to go through an entire rebase then?

Is there a suggested way of handling the conflicts? Eg. choosing current over incoming or vice versus?

I don't know if there's a particular way that is best, it might be helpful to squash the branch into a single commit before rebasing though?

Or would it be better/easier to create a brand new stack commit with the diff?