There’s always an xkcd. Don’t forget to read the hover text:
> If that doesn't fix it, git.txt contains the phone number of a friend of mine > who understands git. Just wait through a few minutes of 'It's really pretty > simple, just think of branches as...' and eventually you'll learn the > commands that will fix everything. > On Jan 10, 2020, at 2:57 AM, Michael <keybou...@gmail.com> wrote: > > > On 2020-01-09, at 2:33 PM, Steven Smith <steve.t.sm...@gmail.com > <mailto:steve.t.sm...@gmail.com>> wrote: > >> Me too. We’re discussing MacPorts-relevant git commands in >> https://github.com/macports/macports-ports/pull/6106 >> <https://github.com/macports/macports-ports/pull/6106> . >> >> Easiest, most destructive to local: >> >> # save all local files changed outside the git repo >> >> git fetch --all >> git reset --hard upstream/master >> >> # restore all local files > > I'm sorry, I just have to follow up with this xkcd ... > > https://xkcd.com/1597/ <https://xkcd.com/1597/>
smime.p7s
Description: S/MIME cryptographic signature
