<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=""><div class="">Hello fellow macports users,</div><div class=""><br class=""></div><div class="">As I sometimes try to support stuff myself on macports (very little time for it, so only now and then and that means I tend to forget stuff…) I have created instructions for myself to get me back up to speed when it is time again to try to do some stuff with macports on git</div><div class=""><br class=""></div><div class="">For this, I have this snippet of documentation:</div><div class=""><br class=""></div><div class=""><font face="Courier" class=""><span style="font-style: normal;" class=""># Definitions</span></font></div><div class=""><font face="Courier" class=""><span style="font-style: normal;" class=""># remotes:</span></font></div><div class=""><font face="Courier" class=""><span style="font-style: normal;" class=""># upstream: github/macports/macports-ports is the original <a href="http://macports.org" class="">macports.org</a> repo in github</span></font></div><div class=""><font face="Courier" class=""><span style="font-style: normal;" class=""># origin: github/gctwnl/macports-ports is my FORK of github/macports/macports-ports on github</span></font></div><div class=""><font face="Courier" class=""><span style="font-style: normal;" class=""># local:</span></font></div><div class=""><font face="Courier" class=""><span style="font-style: normal;" class=""># ~/MacPortsDev/macports-ports is the local CLONE of github/gctwnl/macports-ports</span></font></div><div class=""><font face="Courier" class=""><span style="font-style: normal;" class=""><br class=""></span></font></div><div class=""><font face="Courier" class=""><span style="font-style: normal;" class=""># Updating the master of my fork&clone from the master of the original:</span></font></div><div class=""><font face="Courier" class=""><span style="font-style: normal;" class=""><br class=""></span></font></div><div class=""><font face="Courier" class=""><span style="font-style: normal;" class="">git checkout master<span class="Apple-tab-span" style="white-space:pre"> </span># Go to branch master in my local clone</span></font></div><div class=""><font face="Courier" class=""><span style="font-style: normal;" class="">git pull upstream master<span class="Apple-tab-span" style="white-space:pre"> </span># Update my local clone master from the master of the remote upstream</span></font></div><div class=""><font face="Courier" class=""><span style="font-style: normal;" class=""><span class="Apple-tab-span" style="white-space:pre"> </span># (overwrites my local master with remote github/macports/master)</span></font></div><div class=""><font face="Courier" class=""><span style="font-style: normal;" class="">git reset --hard upstream/master<span class="Apple-tab-span" style="white-space:pre"> </span># Resets index and working tree of local clone/master from remote upstream</span></font></div><div class=""><font face="Courier" class=""><span style="font-style: normal;" class="">git push origin master --force <span class="Apple-tab-span" style="white-space:pre"> </span># Push local clone (~/MacPortsDev/macports-ports) master back</span></font></div><div class=""><font face="Courier" class=""><span style="font-style: normal;" class=""><span class="Apple-tab-span" style="white-space:pre"> </span># to my own remote fork (github/gctwnl/macports-ports)</span></font></div><div class=""><font face="Courier" class=""><span style="font-style: normal;" class=""><span class="Apple-tab-span" style="white-space:pre"> </span># NOTE: this closes all open pull-requests!</span></font></div><div class=""><font face="Courier" class=""><span style="font-style: normal;" class=""><span class="Apple-tab-span" style="white-space:pre"> </span># username: gctwnl</span></font></div><div class=""><font face="Courier" class=""><span style="font-style: normal;" class=""><span class="Apple-tab-span" style="white-space:pre"> </span># password: GitHub Token (in BitWarden)</span></font></div><div class=""><br class=""></div><div class="">When I today ran <span style="font-family: Menlo; font-size: 11px;" class="">git branch -a</span> after that I got:</div><div class=""><br class=""></div><div class=""><div style="margin: 0px; font-stretch: normal; font-size: 11px; line-height: normal; font-family: Menlo;" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">albus:macports-ports sysbh$ git branch -a</span></div><div style="margin: 0px; font-stretch: normal; font-size: 11px; line-height: normal; font-family: Menlo;" class=""><span style="font-variant-ligatures: no-common-ligatures" class=""> dovecot-2.3.16</span></div><div style="margin: 0px; font-stretch: normal; font-size: 11px; line-height: normal; font-family: Menlo; color: rgb(47, 180, 29);" class=""><span style="font-variant-ligatures: no-common-ligatures; color: #000000" class="">* </span><span style="font-variant-ligatures: no-common-ligatures" class="">master</span></div><div style="margin: 0px; font-stretch: normal; font-size: 11px; line-height: normal; font-family: Menlo;" class=""><span style="font-variant-ligatures: no-common-ligatures" class=""> upstream</span></div><div style="margin: 0px; font-stretch: normal; font-size: 11px; line-height: normal; font-family: Menlo;" class=""><span style="font-variant-ligatures: no-common-ligatures" class=""> </span><span style="font-variant-ligatures: no-common-ligatures; color: #b42419" class="">remotes/origin/HEAD</span><span style="font-variant-ligatures: no-common-ligatures" class=""> -> origin/master</span></div><div style="margin: 0px; font-stretch: normal; font-size: 11px; line-height: normal; font-family: Menlo; color: rgb(180, 36, 25);" class=""><span style="font-variant-ligatures: no-common-ligatures; color: #000000" class=""> </span><span style="font-variant-ligatures: no-common-ligatures" class="">remotes/origin/dovecot-2.3.16</span></div><div style="margin: 0px; font-stretch: normal; font-size: 11px; line-height: normal; font-family: Menlo; color: rgb(180, 36, 25);" class=""><span style="font-variant-ligatures: no-common-ligatures; color: #000000" class=""> </span><span style="font-variant-ligatures: no-common-ligatures" class="">remotes/origin/master</span></div><div style="margin: 0px; font-stretch: normal; font-size: 11px; line-height: normal; font-family: Menlo; color: rgb(180, 36, 25);" class=""><span style="font-variant-ligatures: no-common-ligatures; color: #000000" class=""> </span><span style="font-variant-ligatures: no-common-ligatures" class="">remotes/origin/multiple-unbounds</span></div><div style="margin: 0px; font-stretch: normal; font-size: 11px; line-height: normal; font-family: Menlo; color: rgb(180, 36, 25);" class=""><span style="font-variant-ligatures: no-common-ligatures; color: #000000" class=""> </span><span style="font-variant-ligatures: no-common-ligatures" class="">remotes/upstream/boost_1.72.0_update</span></div><div style="margin: 0px; font-stretch: normal; font-size: 11px; line-height: normal; font-family: Menlo; color: rgb(180, 36, 25);" class=""><span style="font-variant-ligatures: no-common-ligatures; color: #000000" class=""> </span><span style="font-variant-ligatures: no-common-ligatures" class="">remotes/upstream/dar</span></div><div style="margin: 0px; font-stretch: normal; font-size: 11px; line-height: normal; font-family: Menlo; color: rgb(180, 36, 25);" class=""><span style="font-variant-ligatures: no-common-ligatures; color: #000000" class=""> </span><span style="font-variant-ligatures: no-common-ligatures" class="">remotes/upstream/kencu-py-sphinxcontrib-svg2pdfconverter</span></div><div style="margin: 0px; font-stretch: normal; font-size: 11px; line-height: normal; font-family: Menlo; color: rgb(180, 36, 25);" class=""><span style="font-variant-ligatures: no-common-ligatures; color: #000000" class=""> </span><span style="font-variant-ligatures: no-common-ligatures" class="">remotes/upstream/master</span></div><div style="margin: 0px; font-stretch: normal; font-size: 11px; line-height: normal; font-family: Menlo; color: rgb(180, 36, 25);" class=""><span style="font-variant-ligatures: no-common-ligatures; color: #000000" class=""> </span><span style="font-variant-ligatures: no-common-ligatures" class="">remotes/upstream/py38-reproject</span></div><div style="margin: 0px; font-stretch: normal; font-size: 11px; line-height: normal; font-family: Menlo; color: rgb(180, 36, 25);" class=""><span style="font-variant-ligatures: no-common-ligatures; color: #000000" class=""> </span><span style="font-variant-ligatures: no-common-ligatures" class="">remotes/upstream/wireshark3-3-0-5</span></div></div><div class=""><span style="font-variant-ligatures: no-common-ligatures" class=""><br class=""></span></div><div class="">I understand the first three: I’m on master, I still have the <span style="font-family: Menlo; font-size: 11px;" class="">dovecot-2.3.16 </span>branch in my clone as I haven’t removed it yet. I used it a while back as part of work by a number of people updating dovecot. Dovecot is now also at 2.3.16 in the main repo. I am going to clean that up (haven’t yet)</div><div class="">I also understand the 6 remotes/upstream entries at the end, these are branches in the main repo.</div><div class="">But I do not fully understand the remotes/origin ones. Specifically: <span style="caret-color: rgb(180, 36, 25); color: rgb(180, 36, 25); font-family: Menlo; font-size: 11px;" class="">remotes/origin/multiple-unbounds</span>. I did some work on unbound as well (enabling to run multiple parallel unbound resolvers from launchd) and this has been pulled into the main repository. When that had happened, I deleted my branch. Apparently I forgot to do something because it still shows up in remotes/origin. Why, though? What did I forget to do?</div><div class=""><br class=""></div><div class="">
<div dir="auto" style="caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0); 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; word-wrap: break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" class=""><div dir="auto" style="caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0); 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; word-wrap: break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" class=""><div dir="auto" style="caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0); 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; word-wrap: break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" class=""><div dir="auto" style="caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0); 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; word-wrap: break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" class=""><div dir="auto" style="caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0); 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; word-wrap: break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" class=""><div dir="auto" style="caret-color: rgb(0, 0, 0); color: rgb(0, 0, 0); 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; word-wrap: break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" class=""><div><div class="">Gerben Wierda (<a href="https://www.linkedin.com/in/gerbenwierda" class="">LinkedIn</a>)</div><div class=""><a href="https://ea.rna.nl/" class="">R&A Enterprise Architecture</a> (main site)<br class="">Book: <a href="https://ea.rna.nl/the-book/" class="">Chess and the Art of Enterprise Architecture</a><br class="">Book: <a href="https://ea.rna.nl/the-book-edition-iii/" class="">Mastering ArchiMate</a><br class=""></div></div></div></div></div></div></div></div>
</div>
<br class=""></body></html>