Help needed - Github / Gitgui

[Milko]

Hello

I ask for help on how to use github, are some evenings when I try to solve some problems, but I could not even using the various resources available online.
I use gitgui but I also gitbash.

I have a repository at github (account milkogit, pak128brit). The repository is a fork Jamespetts account.

I managed to publish the changes and get them to James, but I can not update my repository with the news of James.
What I would like to be able to do is update my branch "master" with the innovations introduced by James in his branch "master".

I would have another question, I have two branches: master and payload, how can I do to merge the master branch in the branch payload?

Giuseppe

[Dwachs]

To update master branch:
In the git gui you do:
-- checkout your master branch (if not already done)
-- fetch from remote -> jamespetts/simutrans-pak128.britain
-- local merge jamespetts/simutrans-pak128.britain/master

then the your current branch is updated to contain all the changes of James' master branch.

To merge payload into master:
-- checkout your master branch (if not already done)
-- local merge -> payload

Hope this helps

[Milko]

Hello Dwachs

-- checkout your master branch (if not already done)

I think my problem is here.
When, using gitgui, I update my local repository, the procedure goes well with "success" but my repository is not updated. I have to update the remote github repository first? (I do not know how to do it ..)

Giuseppe

[Dwachs]

'git checkout' is just the command to switch to the correct branch. In the git-gui it should be like Branches -> Checkout -> Master. If you are already on the master branch, this can be seen directly in git-gui: status line below the menu.

To download the changes from James, you click: Remote -> fetch from -> jamespetts/pakset, Then Merge -> local Merge -> jamespetts/pakset.

Which of these steps fail or do not produce anything?

[Milko]

@Dwachs

Thank's, problem solved. 

The problem was that, in gitgui, I had not added the link to the repository of James.

Giuseppe