I'm at a new company and using graphite again, but am having an issue I didn't have last time. Whenever I restack, i'm prompted to make the same merge conflict resolutions multiple times, almost as if it's rebasing one commit at a time? This didn't happen when I used it before so I don't think it's a bug but user error 😄

So we do rebase one commit at a time (that hasn't changed), but that shouldn't result in multiple conflict resolutions — if you resolve a conflict when you rebase one commit, the next commit shouldn't need to resolve the same one. This is a tricky one to debug — my best advice is, • next time you know you're about to restack a branch, check the current SHA of that branch and its parent with

git rev-parse <branch>

and

git rev-parse <parent>

• run the graphite command with

--debug

• if you see this issue, DM me the shas and the debug output and I can debug with youto see if we're performing the correct git operation under the hood

DMing you now