https://linen.dev logo
Join Slack
Powered by
hey, there's a super bad bug that silently (and po...
# report-bugs
t
hey, there's a super bad bug that silently (and possibly irrecoverably) loses your staged work: 1. 
gt create
2. 
gt submit
3. (PR gets merged) 4. make change and 
gt modify
5. 
gt submit
6. all your changes on local are gone!
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>
hey Tyler, would like some more detail to try reproducing this. To confirm, you don't 
gt sync
after merging so you still have a local version of the branch even though remotely it has merged? When running 
gt modify
, did you amend its commit or create a new commit? Were any other prompts presented and responded to?
(by the way, you should check in git reflog in case your local changes are still referenced in there)
I followed your repro steps and the CLI posted a warning prompt due to the branch being merged already:
r
This. Issue. Drives. Me. Nuts. I must hit it at least once a week
There really should be a better flow default that creates a temp branch with the delta of changes between the current branch, and the already submitted PR
Otherwise if the intent is that the default flow captures the changeset in the parent branch - I find stuff goes missing all the time and I have no idea why
(Imo the ideal would be to diff the current, and the PR's branch, and create a temp pr that sits between trunk and the parent)
p
hey Rory, I feel you here. This is a tricky situation when local and remote states are divergent. Will surface feedback to the team
2 Views
Open in Slack
PreviousNext
Powered by