On Friday, 6 November 2015 at 11:07:10 UTC, Gerald Jansen wrote:
Okay, so we have slight variations that cause confusion for
newcomers like me:
Model A:
- directly clone upstream (becomes origin)
- create topic-branch; work; commit
- switch to master branch; pull --ff-only origin master
- switch to topic-branch; rebase from master branch
- create my fork in github and add remote myfork
- push to myfork
Model B: (recommended if you are planning to create PRs from
the outset?)
- first create my fork in github
- clone my fork (becomes origin)
- create topic-branch; work; commit
- add remote upstream
- switch to master branch; pull --ff-only upstream master
- switch to topic-branch; rebase from master branch
- push to origin
Of course there are many possible workflows with git and
github, but it would be helpful to beginners if the various D
wiki pages (and advice on the forums) followed a consistent
model.
Thanks for this post. There is some confusion, which makes people
say "Naw, I dunno, maybe tomorrow." At least me!
