On Thu, 3 Sep 2020 at 00:05, Ernie Rael <err...@raelity.com> wrote:
> Uhhhh. OK, I didn't look carefully enough. I'll rebase my in-progress
> pull requests against "upstream/master". If things change and
> "default/master", becomes the spot, I'll deal with it then.

I'm not sure what default/master is in this context - presumably
equivalent to origin master.  In which case, this is expected.

So I have two remotes in git, origin and upstream - output of git remote -v is

origin    https://github.com/neilcsmith-net/netbeans.git (fetch)
origin    https://github.com/neilcsmith-net/netbeans.git (push)
upstream    https://github.com/apache/netbeans.git (fetch)
upstream    DISABLED (push)

The origin repository branches do not pick up changes from upstream
automatically.  So you usually need to pull master from upstream and
push to your origin / default on a regular basis to keep it
up-to-date.

You'll also see there that I have got in the habit of setting push-url
to DISABLED on upstream repositories.

Best wishes,

Neil

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@netbeans.apache.org
For additional commands, e-mail: dev-h...@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists



Reply via email to