What's the easiest / safest way to update my own forks of D on github?

On Thursday, 21 May 2015 at 09:35:47 UTC, Chris wrote:
> What's the easiest / safest way to update my own forks of D on github?

http://wiki.dlang.org/Pull_Requests

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.

On 21/05/2015 10:39 p.m., 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.


Or for Windows/OSX you can use SourceTree.
It is amaaaaaaaaaaaaazing!

https://www.sourcetreeapp.com/

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"

Weird.

On Thursday, 21 May 2015 at 10:42:34 UTC, Rikki Cattermole wrote:
> On 21/05/2015 10:39 p.m., 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.
>
>
> Or for Windows/OSX you can use SourceTree.
> It is amaaaaaaaaaaaaazing!
>
> https://www.sourcetreeapp.com/

i'm a bit less enthusiast than you about this soft even if i use to be:

+ easy commits: push/pull/commit
+ easy branches: switch/create/delete
+ easy remotes: manage different sources (e.g official & your forks)

- more complex things, squash, rebase, still have to use the console.
- big repositories are slow to open/refresh/switch branch
- several times ST has completly ruined my local repositories.
- it's a nightmare with any repos based on many sub repositories.
- it doesn't use *libgit*, but *git* executable itself, and it doesn't seem to balance well multiple instances among the cores.

Still the best git GUI but it has some obvious problems and bugs.

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

On 22/05/2015 1:30 a.m., Baz wrote:
> On Thursday, 21 May 2015 at 10:42:34 UTC, Rikki Cattermole wrote:
>> On 21/05/2015 10:39 p.m., 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.
>>
>>
>> Or for Windows/OSX you can use SourceTree.
>> It is amaaaaaaaaaaaaazing!
>>
>> https://www.sourcetreeapp.com/
>
> i'm a bit less enthusiast than you about this soft even if i use to be:
>
> + easy commits: push/pull/commit
> + easy branches: switch/create/delete
> + easy remotes: manage different sources (e.g official & your forks)
>
> - more complex things, squash, rebase, still have to use the console.
> - big repositories are slow to open/refresh/switch branch
> - several times ST has completly ruined my local repositories.
> - it's a nightmare with any repos based on many sub repositories.
> - it doesn't use *libgit*, but *git* executable itself, and it doesn't
> seem to balance well multiple instances among the cores.
>
> Still the best git GUI but it has some obvious problems and bugs.

IMO making a good UI for VC is hard. As you said even SourceTree isn't perfect.

If only somebody could make a better cross platform one.

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.

On Thursday, 21 May 2015 at 13:40:22 UTC, Rikki Cattermole wrote:
>
> IMO making a good UI for VC is hard. As you said even SourceTree isn't perfect.
>
> If only somebody could make a better cross platform one.

Go ahead, write on in D ;)