<html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" class="">There’s always an xkcd.<div class=""><br class=""></div><div class="">Don’t forget to read the hover text:</div><div class=""><br class=""></div><div class=""><blockquote type="cite" class="">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.</blockquote><div><br class=""><blockquote type="cite" class=""><div class="">On Jan 10, 2020, at 2:57 AM, Michael <<a href="mailto:keybounce@gmail.com" class="">keybounce@gmail.com</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><div style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 24px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><div class=""><br class="Apple-interchange-newline">On 2020-01-09, at 2:33 PM, Steven Smith <<a href="mailto:steve.t.smith@gmail.com" class="">steve.t.smith@gmail.com</a>> wrote:</div><br class="Apple-interchange-newline"><blockquote type="cite" class=""><div dir="auto" class=""><div dir="ltr" class="">Me too. We’re discussing MacPorts-relevant git commands in <a href="https://github.com/macports/macports-ports/pull/6106" class="">https://github.com/macports/macports-ports/pull/6106</a> .</div><div dir="ltr" class=""><br class=""></div><div dir="ltr" class="">Easiest, most destructive to local:</div><div dir="ltr" class=""><br class=""></div><div dir="ltr" class=""># save all local files changed outside the git repo</div><div dir="ltr" class=""><br class=""></div><div dir="ltr" class="">git fetch --all</div><div dir="ltr" class="">git reset --hard upstream/master</div><div dir="ltr" class=""><br class=""></div><div dir="ltr" class=""># restore all local files</div></div></blockquote><br class=""></div><div style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 24px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class="">I'm sorry, I just have to follow up with this xkcd ...</div><div style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 24px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><br class=""></div><div style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 24px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><a href="https://xkcd.com/1597/" class="">https://xkcd.com/1597/</a></div></div></blockquote></div><br class=""></div></body></html>