This message was deleted.
# report-bugs
s
This message was deleted.
👍 1
d
Just reporting in that I’m seeing the same behavior as @Tyler Laprade here, and @Daniel Povolotski above - I think it’s probably happening for everyone? Only started happening for me in 0.22.10 - earlier versions of 0.22.x were fine. The
gt downstack get
mentioned in the message doesn’t ever help in this situation - always end up with an unnecessary
--force
👍 1
j
cc @Alyssa Baum
a
Looking into this!
Tyler and Dominic, are either of you still in this loop?
t
I manually resolved with
--force
a
Ok, looking into this issue now. If you have repro steps that would be helpful.
t
Okay, I think I have a rough idea of the steps. I used GTI for all the Graphite commands, and the default “Source Control” VSC sidebar for the non-Graphite commands. 1. Make a new branch in Graphite and submit it. 2. Add another commit and push it in Git. 3. Make an additional change and use Graphite to amend my change. 4. Attempt to submit -> error
All 3 of my changes were in separate files, so no merge conflicts
a
Thanks, super helpful. I can repro.
🙌 1
❤️ 1