4 ms·
Oof, thanks for that warning. So it will blow away changes you haven’t merged (only fetched)? I guess git can’t tell the he difference between “not merged yet
by FPGAhacker 4y ago
Oof, thanks for that warning. So it will blow away changes you haven’t merged (only fetched)?
I guess git can’t tell the he difference between “not merged yet” and “don’t want to merge, please destroy”
- erik_seaberg 4y agoThe changes still exist in the repo’s reflog (for 30 days by default), but they might not be reachable from the ref’s new tip commit.
- rawling 4y agoIf you don't want to blow away changes you haven't merged, you shouldn't be doing force at all?
- FPGAhacker 4y agoWell, the article presents a seemingly nice workflow that lets you handle local rebases. I was considering it. However, we use vscode, and I rather like auto fetch. But apparently this workflow would destroy something auto fetched that I might not have even noticed.