How do I merge my own fork with updates from the main fork

[miniupnp]

Hello,

Well, it looks like you have added 6 commits in you master branch.
$ git status
should tell you that.
Merging upstream/master doesn't remove theses commits.
It just "merges" new commits from the upstream/master branch into your
current branch.

To understand what is in your branch, you should use the command :
$ git log --graph --decorate --all

the github graph is also useful :
https://github.com/gctwnl/macports-ports/network

What exactly do you want to do ?
- have your master branch perfectly in sync with upstream/master ?
In that case you should only commit in some other "work" branches.

- use your master branch as a "work" branch.
In that case I advise you to rebase on the upstream master.

$ git fetch --all --prune
$ git checkout master
$ git rebase upstream/master
$ git push --force origin master



Le 24/08/2019 à 12:12, Gerben Wierda a écrit :
> I’ve created my own git fork of macports to work on port updates (have
> submitted one pull request so far).
>
> Now ether is (for me) macports/macports-ports and
> gctwnl/macports-ports (the one from which I’ve created a pull request).
>
> 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.
>
> On my local machine, I see this in my macports-ports directory:
>
> Albus:macports-ports sysbh$ git remote -v
> originhttps://github.com/gctwnl/macports-ports.git (fetch)
> originhttps://github.com/gctwnl/macports-ports.git (push)
> upstreamhttps://github.com/macports/macports-ports.git (fetch)
> upstreamhttps://github.com/macports/macports-ports.git (push)
>
> So, only my own. These are the commands I ran locally:
>
>    14  git fetch upstream
>    15  git merge upstream/master
>    22  git push
>
> But instead of being in sync, GitHub.com <http://GitHub.com> for
> gctwnl/macports-ports branch master says:
>
> This branch is 6 commits ahead of macports:master.
>
> So, I am obviously missing something.
>
> Gerben Wierda
> Chess and the Art of Enterprise Architecture <http://enterprisechess.com/>
> Mastering ArchiMate <http://masteringarchimate.com/>
> Architecture for Real Enterprises
> <https://www.infoworld.com/blog/architecture-for-real-enterprises/> at
> InfoWorld
> On Slippery Ice <https://eapj.org/on-slippery-ice/> at EAPJ
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macports.org/pipermail/macports-users/attachments/20190824/9acfa7e4/attachment.html>