On 25/01/2018 7:03 AM, I?aki ?car wrote:> 2018-01-25 12:20 GMT+01:00 Duncan Murdoch <murdoch.duncan at gmail.com>: >> On 25/01/2018 2:57 AM, I?aki ?car wrote: >>> >>> For what it's worth, this is my workflow: >>> >>> 1. Get a fork. >>> 2. From the master branch, create a new branch called fix-[something]. >>> 3. Put together the stuff there, commit, push and open a PR. >>> 4. Checkout master and repeat from 2 to submit another patch. >>> >>> Sometimes, I forget the step of creating the new branch and I put my >>> fix on top of the master branch, which complicates things a bit. But >>> you can always rename your fork's master and pull it again from >>> upstream. >>> >> >> I saw no way to follow your renaming suggestion. Can you tell me the steps >> it would take? Remember, there's already a PR from the master branch on my >> fork. (This is for future reference; I already followed Gabor's more >> complicated instructions and have solved the immediate problem.) > > Sorry for the confusion: the step of renaming your master branch isn't > really needed, because you can pull the original master branch and > call it whatever you want in one command. The process is as follows:Thanks. I've tried some of this, and am a little confused.> > 1) Add the upstream repo as another remote: > > git remote add upstream https://github.com/the/original/repo > > 2) Pull the upstream master with a different name: > > git pull upstream master:patch2I've done all that, and now on my local copy I have a branch. I called it "upstreamMaster", because at this point it matches the upstream master, and I intend to maintain it that way.> > 3) Edit, add, commit and push patch2 to your fork: > > git checkout patch2 > ... > git push origin patch2I did this, except that the "..." contains nothing, because I want this branch to continue. But now my problem is that I can't see any way to tell Github about this new branch. I ran git push origin upstreamMaster and got Total 0 (delta 0), reused 0 (delta 0) To https://github.com/dmurdoch/manipulateWidget * [new branch] upstreamMaster -> upstreamMaster but that branch doesn't show up in the Github web site. Any suggestions? Duncan Murdoch> > 4) open a fresh new PR from "patch2" (the first one is intact).
On Thu, Jan 25, 2018 at 12:34 PM, Duncan Murdoch <murdoch.duncan at gmail.com> wrote: [...]> but that branch doesn't show up in the Github web site.It is right there: https://github.com/dmurdoch/manipulateWidget/branches> Any suggestions?Personally I would suggest to call it master, because it is just easier. Your master should correspond to the upstream master, and you can do your own stuff in other branches. G. [...]
Hi Duncan, I can see that branch on your github. Remember that you have to reload the github page to see the latest additions to your repo. It doesn't do that automatically. Cheers Joris On Thu, Jan 25, 2018 at 1:34 PM, Duncan Murdoch <murdoch.duncan at gmail.com> wrote:> On 25/01/2018 7:03 AM, I?aki ?car wrote: > >> 2018-01-25 12:20 GMT+01:00 Duncan Murdoch <murdoch.duncan at gmail.com>: >> >>> On 25/01/2018 2:57 AM, I?aki ?car wrote: >>> >>>> >>>> For what it's worth, this is my workflow: >>>> >>>> 1. Get a fork. >>>> 2. From the master branch, create a new branch called fix-[something]. >>>> 3. Put together the stuff there, commit, push and open a PR. >>>> 4. Checkout master and repeat from 2 to submit another patch. >>>> >>>> Sometimes, I forget the step of creating the new branch and I put my >>>> fix on top of the master branch, which complicates things a bit. But >>>> you can always rename your fork's master and pull it again from >>>> upstream. >>>> >>>> >>> I saw no way to follow your renaming suggestion. Can you tell me the >>> steps >>> it would take? Remember, there's already a PR from the master branch on >>> my >>> fork. (This is for future reference; I already followed Gabor's more >>> complicated instructions and have solved the immediate problem.) >>> >> >> Sorry for the confusion: the step of renaming your master branch isn't >> really needed, because you can pull the original master branch and >> call it whatever you want in one command. The process is as follows: >> > > Thanks. I've tried some of this, and am a little confused. > > >> 1) Add the upstream repo as another remote: >> >> git remote add upstream https://github.com/the/original/repo >> >> 2) Pull the upstream master with a different name: >> >> git pull upstream master:patch2 >> > > I've done all that, and now on my local copy I have a branch. I called it > "upstreamMaster", because at this point it matches the upstream master, and > I intend to maintain it that way. > > >> 3) Edit, add, commit and push patch2 to your fork: >> >> git checkout patch2 >> ... >> git push origin patch2 >> > > I did this, except that the "..." contains nothing, because I want this > branch to continue. > > But now my problem is that I can't see any way to tell Github about this > new branch. I ran > > git push origin upstreamMaster > > and got > > Total 0 (delta 0), reused 0 (delta 0) > To https://github.com/dmurdoch/manipulateWidget > * [new branch] upstreamMaster -> upstreamMaster > > but that branch doesn't show up in the Github web site. > > Any suggestions? > > Duncan Murdoch > > >> 4) open a fresh new PR from "patch2" (the first one is intact). >> > > ______________________________________________ > R-devel at r-project.org mailing list > https://stat.ethz.ch/mailman/listinfo/r-devel-- Joris Meys Statistical consultant Department of Data Analysis and Mathematical Modelling Ghent University Coupure Links 653, B-9000 Gent (Belgium) <https://maps.google.com/?q=Coupure+links+653,%C2%A0B-9000+Gent,%C2%A0Belgium&entry=gmail&source=g> ----------- Biowiskundedagen 2017-2018 http://www.biowiskundedagen.ugent.be/ ------------------------------- Disclaimer : http://helpdesk.ugent.be/e-maildisclaimer.php [[alternative HTML version deleted]]
On 25/01/2018 7:44 AM, Joris Meys wrote:> Hi Duncan, > > I can see that branch on your github. Remember that you have to reload > the github page to see the latest additions to your repo. It doesn't do > that automatically.Thanks, that was the issue. Duncan Murdoch
On 25/01/2018 7:44 AM, G?bor Cs?rdi wrote:> On Thu, Jan 25, 2018 at 12:34 PM, Duncan Murdoch > <murdoch.duncan at gmail.com> wrote: > [...] >> but that branch doesn't show up in the Github web site. > > It is right there: > https://github.com/dmurdoch/manipulateWidget/branches > >> Any suggestions? > > Personally I would suggest to call it master, because it is just > easier. Your master should correspond to the upstream master, and you > can do your own stuff in other branches.That makes sense, but I don't see a way to rename branches on Github. I did see a way to make it my default branch, but there's a scary warning: "Are you sure? Changing your default branch can have unintended consequences that can affect new pull requests and clones." To answer yes to this I would have to say "I understand, update the default branch", and since I don't understand the consequences, I didn't click it. Duncan Murdoch