[PRs] How to update on Github

[Chris via Digitalmars-d]

On Thursday, 21 May 2015 at 13:34:53 UTC, Steven Schveighoffer 
wrote:
> On 5/21/15 7:29 AM, Chris wrote:
>> On Thursday, 21 May 2015 at 10:39:46 UTC, ZombineDev wrote:
>>> Basically you need clone your fork to your computer, add a 
>>> "upstream"
>>> remote to github.com/D-Programming-Language/[repo name, eg. 
>>> phobos],
>>> pull from upstream the new changes and optionally update 
>>> github by
>>> pushing to origin (origin normally is github).
>>> It may sound complicated doing this from the command-line, 
>>> but after a
>>> few times you'll get used to it.
>>
>> Yes, I've done all this and it seems to work (it says "Able to 
>> merge.
>> These branches can be automatically merged."), but still I bet 
>> the info
>>
>> "This branch is 2 commits ahead, 13 commits behind
>> D-Programming-Language:master"
>
> Don't worry about that. What it's saying is that 13 commits 
> have occurred on D master since you forked from master, and you 
> have added 2 commits in your local repository that master 
> doesn't have. It's just basically saying the length of each of 
> the prongs in the fork.
>
> The fact that you can automatically merge simply means that you 
> haven't committed anything that would conflict with those other 
> 13 commits.
>
> It's all normal :) Once you add the pull request, the auto 
> tester will test the version that merges both. You don't have 
> to do that yourself (unless you want to be pedantic). If every 
> PR had to keep up with all other merges, we'd be spending so 
> much more overhead on merging. This is the beauty of 
> git/distributed source control over classic forms such as CVS 
> or subversion.
>
> -Steve

Ok, cool.