Jon Stelly
06/16/2025, 8:40 PMgt get or gt sync to resolve, nothing is resolved, my local change is not pushed, stuck in circle
2 questions I guess:
β’ how can I avoid getting into this state (understand the remote changes thing will happen, but this endless loop / circle is what I'd like to avoid, curious if there's some specific process/flow that's causing it?)
β’ more pressingly, what's the best safe path to resolve? I don't think the --force option is super risky in this case since coworker and I are working on different areas, but is that the best way forward?
zsh: ~/code/my-project> gt submit --stack
π₯ Validating that this Graphite stack is ready to submit...
ERROR: Branch feature/my-feature has been updated remotely. Use gt get or gt sync to sync with remote before submitting (or use the --force flag to override this check).
zsh: ~/code/my-project> gt get
π² Fetching branches from remote...
Running git fetch: [========================================] 100% | Done
main is up to date.
π Syncing branches...
Branch feature/my-feature is up to date with remote (PR #4846 v29).
π₯ Restacking branches...
feature/my-feature does not need to be restacked on main.
Already on feature/my-feature.
zsh: ~/code/my-project> gt submit --stack
π₯ Validating that this Graphite stack is ready to submit...
ERROR: Branch feature/my-feature has been updated remotely. Use gt get or gt sync to sync with remote before submitting (or use the --force flag to override this check).
EDIT: Just submitted CLI feedback named jon-stelly-bug-report. Let me know if you need more info, not sure if the cli debug log is enoughPylon
06/16/2025, 8:40 PMgt feedback --with-debug-context <any message>Bhav Bhela
06/16/2025, 8:56 PMPylon
06/16/2025, 9:18 PMJon Stelly
06/17/2025, 1:20 PMgt sync which pulled in some changes from main, then submitted the stack. Then when I went back to my main computer where I was having this issue, gt get found and merged the new changes with my local changes. I was then able to submit the stack from that computer with the changes.
So it feels like the problem on my main computer was like the gt get/sync commands weren't seeing the remote changes until they got bumped/incremented, but gt submit stack was. I wouldn't think this would have anything to do with time but just to mention it, my coworker who I'm collaborating on this stack with is in a different time-zone.
Anyway, no time pressure to resolve this now but I would be curious if there are any findings of what exactly happened here, if there's some behavior/pattern I'm doing that gets us into this state.
Thanks