Re: git: Pulling from master

>From phone. Thank you everyone. I am finally github - able. Took large chunk of my day but it was worth it. Kind regards, Willem On 17 Nov 2017 17:53, "Dirk Hohndel" wrote: > On Nov 17, 2017, at 7:51 AM, Willem Ferguson < willemfergu...@zoology.up.ac.za> wrote: > > On

Re: git: Pulling from master

> On Nov 17, 2017, at 7:51 AM, Willem Ferguson > wrote: > > On 17/11/2017 17:38, Dirk Hohndel wrote: >> >> And just in case that isn't obvious - there really isn't a huge need to keep >> the 'master' in your fork in sync with upstream. You can always just

Re: git: Pulling from master

> On Nov 17, 2017, at 4:32 AM, Willem Ferguson > wrote: > ~/src/$ git clone g...@github.com:Subsurface-divelog/subsurface.git > Cloning into 'subsurface'... > Permission denied (publickey). > fatal: Could not read from remote repository. See my other email -

Re: git: Pulling from master

> On Nov 17, 2017, at 2:20 AM, Jan Mulder wrote: > > On 17-11-17 10:59, Willem Ferguson wrote: >> I am sorting out the Github mechanism for myself. >> Two questions: >> 1) The upstream repository. Currently there are two such repositories: >> i)

Re: git: Pulling from master

On 17/11/2017 12:20, Jan Mulder wrote: And I use a stupid script to get things synced: git checkout master git tag -d continuous # recently added to get the continuous label moved git fetch upstream git merge upstream/master git push origin master # push things to my github account --jan