This message was deleted.
# how-do-is
Slackbot
08/01/2023, 1:53 PMThis message was deleted.
a
Aryaman
08/01/2023, 3:29 PMHmm, did your coworker do a
gt stack submit -fgt stack submitAryaman
08/01/2023, 3:29 PMcc @Jacob Gold who is working on improving our collaboration workflow.
g
Grant Mulitz
08/01/2023, 3:30 PMi'm not sure, I'll double check
j
Jacob Gold
08/01/2023, 3:33 PMWe're working on improving this type of workflow, I appreciate this feedback and am sorry that you ran into it! We currently rely on git's force-with-lease feature, which uses the state of remote-tracking branches to determine whether you are overwriting someone else, and this is not a silver bullet as certain tools update remote-tracking branches in the background.
With that said, for now you might need to either check the state of branches remotely manually or create a branch stacked upon your coworkers to ensure this doesn't happen 100% of the time...
Fwiw, even if you force push, GitHub keeps track of the old SHAs so you can always reset your branch locally to what remote had that you overwrote, and then try to reconcile that with your local changes, but it would require a little Git-fu
Jacob Gold
08/22/2023, 4:13 PMWe're releasing a new version of the CLI today that warns you when this happens on
submit