> On Nov 2, 2016, at 11:24 PM, Ryan Schmidt <ryandes...@macports.org> wrote: > > Yes, there are "command line instructions" on the web site, but they > are different from the commands you gave below, which are again > different from other commands suggested in previous threads, so it is > difficult to know which set of instructions to follow.
Obviously I think you should follow mine ;) The GitHub instructions assume that you're okay with nonlinear history (they create merge commits), so we can't really use them. But I found them useful for developing my instructions. > Thanks, that worked, up until the "git push origin master" command, > which asked me to authenticate, and supplying my username and password > was unsuccessful: > > $ git push origin master > Username for 'https://github.com': ryandesign > Password for 'https://ryandes...@github.com': > remote: Invalid username or password. > fatal: Authentication failed for > 'https://github.com/macports/macports-ports.git/' That's curious. What does "git remote -v" print? > Now I still seem to have this branch in my local git repo: > > $ git branch > l2dy-curl-ca-bundle-update > * master > > Can I delete it? With, I presume, "git branch -d l2dy-curl-ca-bundle-update"? Yeah, you can delete it. You should NOT use "git branch -D" as Sterling suggested because these instructions are designed so that you can always fast-forward merge the PR branch into master. If "git branch -d" fails, something is not right, and you have to go back and figure out what. One small addendum: Before "git push origin master", you should run "git pull --rebase" to get any new commits that were pushed by other committers. vq _______________________________________________ macports-dev mailing list macports-dev@lists.macosforge.org https://lists.macosforge.org/mailman/listinfo/macports-dev
