My experience has been "git pull" -- starts a merge -- slowly back away, "git reset --hard", and the "git pull --rebase". If this setting would help me avoid that dance, I'm all for it
On Tue, Oct 20, 2020 at 6:55 AM Andrzej Białecki <[email protected]> wrote: > > > On 20 Oct 2020, at 09:33, Dawid Weiss <[email protected]> wrote: > > > [...] in a public repo and may lead to bizarre conflicts and lost local work > > Just to clarify - it's hard to lose a local commit, even if somebody changes > the remote reference. I agree it is almost equally hard to find it once it's > dangling without any named branch or tag (extra knowledge of git is > required). Most of the time you can recover it though - looking at git reflog > is the first step to try. > > > > Yes, that’s technically true … and now multiply this exercise by the number > of devs across the globe, each with some local changes :) I went through this > process once on an active project with a team of dozen people in different > timezones, and it wasn’t pleasant. > > — > > Andrzej Białecki > --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
