Re:Idiot Proof Git
by ok_dad on Wednesday November 09, 2022 @10:11AM
(#33532681)
It will overwrite the tree on remote as long as remote hasn't changed since you last fetched it. Like --force, but can help to prevent overwriting other people's changes when they push in between you fetching. It doesn't always work, particularly if you have a tool which continuously fetches remote, like an IDE configured to do so such as VSCode. In that case, you will have fetched the other person's changes, and --force-with-lease will happily blow-away anything on remote that might not be in your tree yet.
[ Parent
| on HN ]
Re:Idiot Proof Git
by FPGAhacker on Wednesday November 09, 2022 @10:16AM
(#33532762)
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”
If you don't want to blow away changes you haven't merged, you shouldn't be doing force at all?
Re:Idiot Proof Git
by FPGAhacker on Wednesday November 09, 2022 @10:43AM
(#33533194)
Well, 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.
Re:Idiot Proof Git
by erik_seaberg on Thursday November 10, 2022 @04:47AM
(#33544291)
The 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.