I just lost an hours' work (well it's not lost bec...
# report-bugs
b
I just lost an hours' work (well it's not lost because I can git-reflog, but you know what I mean). AFAIK here are the steps that occured: 1. I put up a PR with a new database model for our webapp. 2. A teammate updated that PR's branch with some changes (looking at the reflog, looks like those were new commits on the branch?) 3. Meanwhile, on my laptop, I kept working on my code (this is the work that I lost) 4. I click "Submit" in the VSCode extension, it shows me an error that I need to Sync first. 5. I click "Sync" in the VSCode extension, and... my work disappears. I've noticed this occurs when I have changes-on-origin that aren't in my local - e.g. if a teammate or LLM adds a commit that fixes the code. My work just gets stomped.
👍 1
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>
✅ 1
hey Bryan, apologies for the rough experience there. For our reproduction, did you take any other actions between steps 3 and 4? It seems like Graphite did commit your changes if there're in the reflog but then syncing the newer remote version overwrite the local state.
b
The only thing I noticed on top of this was that (somehow?) I was in a
git bisect
state. (The last time I'd used
git bisect
was about a week ago?) I used
cmd+z
in my IDE's tabs to restore the files, instead of
reflog
, because the SHAs that I was checking-out didn't have my work in them and I got tired of guess-and-checking. (Might've been in reflog! Just not sure about it.)