<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
<body text="#000000" bgcolor="#FFFFFF">
<div class="moz-cite-prefix">Hello, <br>
<br>
Well, it looks like you have added 6 commits in you master branch.<br>
<tt>$ git status</tt><br>
should tell you that.<br>
Merging upstream/master doesn't remove theses commits.<br>
It just "merges" new commits from the upstream/master branch into
your current branch.<br>
<br>
To understand what is in your branch, you should use the command :<br>
<tt>$ git log --graph --decorate --all <br>
</tt><br>
the github graph is also useful : <br>
<a class="moz-txt-link-freetext" href="https://github.com/gctwnl/macports-ports/network">https://github.com/gctwnl/macports-ports/network</a><br>
<br>
What exactly do you want to do ?<br>
- have your master branch perfectly in sync with upstream/master ?<br>
In that case you should only commit in some other "work" branches.<br>
<br>
- use your master branch as a "work" branch.<br>
In that case I advise you to rebase on the upstream master.<br>
<br>
<tt>$ git fetch --all --prune</tt><tt><br>
</tt><tt>$ git checkout master</tt><tt><br>
</tt><tt>$ git rebase upstream/master</tt><tt><br>
</tt><tt>$ git push --force origin master</tt><tt><br>
</tt><tt><br>
</tt><br>
<br>
Le 24/08/2019 à 12:12, Gerben Wierda a écrit :<br>
</div>
<blockquote type="cite"
cite="mid:F0C41D0B-35DD-4C48-985C-440C0B7BF66E@rna.nl">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
I’ve created my own git fork of macports to work on port updates
(have submitted one pull request so far).
<div class=""><br class="">
</div>
<div class="">Now ether is (for me) macports/macports-ports and
gctwnl/macports-ports (the one from which I’ve created a pull
request).</div>
<div class=""><br class="">
</div>
<div class="">It is not perfectly clear to me how I get the
updates from macports/macports-ports back into my fork and be
totally in sync.</div>
<div class=""><br class="">
</div>
<div class="">On my local machine, I see this in my macports-ports
directory:</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="">
<div style="margin: 0px; font-stretch: normal; line-height:
normal;" class=""><span style="font-variant-ligatures:
no-common-ligatures" class="">Albus:macports-ports sysbh$
git remote -v</span></div>
<div style="margin: 0px; font-stretch: normal; line-height:
normal;" class=""><span style="font-variant-ligatures:
no-common-ligatures" class="">origin<span class="Apple-tab-span" style="white-space:pre"> </span><a
href="https://github.com/gctwnl/macports-ports.git"
class="" moz-do-not-send="true">https://github.com/gctwnl/macports-ports.git</a>
(fetch)</span></div>
<div style="margin: 0px; font-stretch: normal; line-height:
normal;" class=""><span style="font-variant-ligatures:
no-common-ligatures" class="">origin<span class="Apple-tab-span" style="white-space:pre"> </span><a
href="https://github.com/gctwnl/macports-ports.git"
class="" moz-do-not-send="true">https://github.com/gctwnl/macports-ports.git</a>
(push)</span></div>
<div style="margin: 0px; font-stretch: normal; line-height:
normal;" class=""><span style="font-variant-ligatures:
no-common-ligatures" class="">upstream<span class="Apple-tab-span" style="white-space:pre"> </span><a
href="https://github.com/macports/macports-ports.git"
class="" moz-do-not-send="true">https://github.com/macports/macports-ports.git</a>
(fetch)</span></div>
<div style="margin: 0px; font-stretch: normal; line-height:
normal;" class=""><span style="font-variant-ligatures:
no-common-ligatures" class="">upstream<span class="Apple-tab-span" style="white-space:pre"> </span><a
href="https://github.com/macports/macports-ports.git"
class="" moz-do-not-send="true">https://github.com/macports/macports-ports.git</a>
(push)</span></div>
<div class=""><span style="font-variant-ligatures:
no-common-ligatures" class=""><br class="">
</span></div>
</div>
</div>
<div class="">So, only my own. These are the commands I ran
locally:</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="">
14 git fetch 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="">
15 git merge upstream/master</span></div>
<div style="margin: 0px; font-stretch: normal; font-size: 11px;
line-height: normal; font-family: Menlo;" class=""> 22 git
push</div>
</div>
<div class=""><span style="font-variant-ligatures:
no-common-ligatures" class=""><br class="">
</span></div>
<div class=""><span style="font-variant-ligatures:
no-common-ligatures" class="">But instead of being in sync, <a
href="http://GitHub.com" class="" moz-do-not-send="true">GitHub.com</a>
for gctwnl/macports-ports branch master says:</span></div>
<div class=""><span style="font-variant-ligatures:
no-common-ligatures" class=""><br class="">
</span></div>
<div class=""><span style="font-variant-ligatures:
no-common-ligatures" class=""><span style="caret-color:
rgb(88, 96, 105); color: rgb(88, 96, 105); font-family:
-apple-system, BlinkMacSystemFont, "Segoe UI",
Helvetica, Arial, sans-serif, "Apple Color Emoji",
"Segoe UI Emoji", "Segoe UI Symbol";
font-size: 14px; background-color: rgb(250, 251, 252);"
class="">This branch is 6 commits ahead of macports:master.</span></span></div>
<div class=""><br class="">
<div class="">So, I am obviously missing something.</div>
<div class=""><br class="webkit-block-placeholder">
</div>
<div class="">
<div style="word-wrap: break-word; -webkit-nbsp-mode: space;
-webkit-line-break: after-white-space;" class="">
<div style="color: rgb(0, 0, 0); font-family: Helvetica;
font-size: 12px; 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;">Gerben Wierda</div>
<div style="color: rgb(0, 0, 0); font-family: Helvetica;
font-size: 12px; 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;" class=""><a
href="http://enterprisechess.com/" class=""
moz-do-not-send="true">Chess and the Art of Enterprise
Architecture</a></div>
<div style="color: rgb(0, 0, 0); font-family: Helvetica;
font-size: 12px; 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;" class=""><a
href="http://masteringarchimate.com/" class=""
moz-do-not-send="true">Mastering ArchiMate</a></div>
<div style="color: rgb(0, 0, 0); font-family: Helvetica;
font-size: 12px; 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;" class=""><a
href="https://www.infoworld.com/blog/architecture-for-real-enterprises/"
class="" moz-do-not-send="true">Architecture for Real
Enterprises</a> at InfoWorld</div>
<div style="color: rgb(0, 0, 0); font-family: Helvetica;
font-size: 12px; 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;" class=""><a
href="https://eapj.org/on-slippery-ice/" class=""
moz-do-not-send="true">On Slippery Ice</a> at EAPJ</div>
</div>
</div>
<br class="">
</div>
</blockquote>
<br>
</body>
</html>