If

git pull

sees a conflict, I would expect

gt sync

to merge it or at the very least warn me about it

(If applicable) To help us repro, please send the following if you haven't already: - PR links, screenshots, and/or debug output if applicable - Repro steps - Does this happen consistently? Just to you or others on your team also? - Is this a regression? Is the problem new? - If you're having an issue with the CLI, please send us debug logs using

gt feedback --with-debug-context <any message>

when next this happens please run

gt feedback --with-debug-context <message>

to send us your CLI logs. The team is working on improvements to

sync

presently 👍

Sent

hey Tyler, circling back here as the team looked into this and in the cases of diverged branches it's expected behavior for the CLI. We are opinionated in how syncing/pulling happens (i.e., rebasing or merge + squash), so if nothing has changed in the diff, we’ll say the branch is up to date, even if git says the branch has diverged.

The only divergence here should've been automatic rebasing and Diamond’s suggestions. I would expect one part of Graphite to play nicely with the others.