https://linen.dev logo
Join Slack
Powered by
Hi sometimes i'm seeing in the graphite PR a bunch...
# report-bugs
b
Hi sometimes i'm seeing in the graphite PR a bunch of unrelated changes from master getting pulled into the diff, this is usually happening when there is a merge conflict that has been resolved via the github UI. 
gt sync
does nothing to solve this and insists that there is no conflict to resolve. I was able to resolve this be manually resolving the conflict in the github ui. Is there some better way to do this solely in graphite?
p
(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>
If you look at the PR in GitHub do you see a merge commit that pulled in changes from trunk. My guess is this is why youre seeing unrelated changes from master getting pulled into the diff. Our recommendation when pushing commits and/or performing merges outside of Graphite is in our docs here. Namely that's to run 
gt sync && gt submit
after performing any of those actions so that the stack in your local environment and in the Graphite web app are up-to-date and appropriately restacked with what's happened to the remote branches. Also you can avoid this alltogether when there is a merge conflict by resolving locally via 
gt rerstack
which walks you through how to resolve in GT
b
yeah normally the merge conflict would come up in gt restack, but for this particular PR gt restack said there is nothing to do after a sync
Open in Slack
PreviousNext
Powered by