Not sure what the best practices are, but what I do: -I have two remotes configured for my local clone, "apache/netbeans" (e.g. named "apache" or "origin") and "jlahoda/netbeans" (e.g. named "github") - see "git remote", in particular "git remote add <name> <url>" -I update my local master from apache/netbeans (e.g. git checkout master && git pull apache master). -when I want to start a feature branch, I update my local master, and branch from it, and then (after commit, etc.) simply push the branch to my github repository. Updating the master on my github fork is not necessary for this to work. Pull requests from the feature branches should work even if your master is not updated. (AFAIK, a branch in git is only a named pointer to a changeset, so "master" is just a "symlink" to a changeset. Pushing a branch will push all necessary changesets, so updating the master "symlink" is not necessary.)
If I want to sync the master branch on my github with apache/netbeans, I simply update my local master and then push the master to my github (e.g. git push github master). Alternatively, you can create a pull request from master on apache/netbeans into the master on your fork, but feels like more manual work that just pull and push. Jan On Wed, Jan 8, 2020 at 12:17 AM Ernie Rael <err...@raelity.com> wrote: > I've got a fork from a couple months ago. I want to use it again and > there's lot's of commits. I've been pulling from upstream, now I want to > look at doing some more pull requests. Is there a way with the github > web interface to ask it to pull from master, or otherwise update to master? > > If not, is it best practice to delete and recreate the fork. Or push > from my local to the fork? > > -ernie > > > --------------------------------------------------------------------- > 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 > > > >
