When my co-worker pushes up to my branch and I have an unpushed commit locally is it possible to do a gt get to get their commit without squashing commits?

(If applicable) To help us more clearly understand what you're trying to do, please provide additional details about: - Screenshots / debug logs / list of commands you've tried to run so far - Your workflow - Current state

hey Jason, I don't think at this time there's any options beyond what

gt

provides for when you

gt get/gt sync

the branch, i.e. having to accept the remote changes as overwriting. One idea is to split your commit off into its own child branch temporarily then re-combine it with the original branch

ah, okay. Then I guess I'll hack up my own script for this that'll do something odd like untrack and track the branch. I'm honestly a bit surprised this doesn't come up more often.