Updating a branch against the master mangos repo

[Ruafo]

Ok, I have a fork I've been working with that I do not own.

I want to update my local copy with all the recent mangos changes.

Is there a git command that it can pull down from the master mangos repo?

I've been looking all over and can't figure out how to do that...

(Already tried contacting the owner of the fork without any luck)

[faramir118]

You can fetch and merge with git pull. Just specify the remote and branch you want like so:

git pull git://github.com/mangos/mangos.git master

If everything applies cleanly, your local repo will gain all commits from the remote, plus one merge commit. You're done!

But if there are conflicts, you need to fix them. After that's done, commit the remote changes, plus merge conflict fixes, like this:

git commit -a

[Darkknight900]

if you have made changes to a mangos fork and want to get all the recent changes just

git fetch mangos
git merge mangos/master

you must first add a remote with

git remote add mangos [url]https://github.com/mangos/mangos.git[/url]

btw. your name on github is also Ruafo?

[Ruafo]

Thank you!

btw. your name on github is also Ruafo?

Yes.

[Darkknight900]

ok i just wanted to say that your "fork" isn't a fork right now ^^

You can easily make a fork with a button the mangos repo got next to the numbers of followers and forks.

Then you will have a complete fork on github.

Just a hint. Make it all as you like to do

[faramir118]

I assume he cloned a fork of mangos and would like to update his local repo with mangos master.

You only need a fork on github if you want to share what you're working on

[Ruafo]

I assume he cloned a fork of mangos and would like to update his local repo with mangos master.

You only need a fork on github if you want to share what you're working on

Correct.

At the moment, I'm not running an active fork of my own. I may end up publishing mine at some point, I have AHBot, MangChat and SD2 integrated though (plus some of my own bells and whistles). So not sure if anyone would really want that in thier build.

[Darkknight900]

kay so nevermind

[xuke771]

OK..i prefer to clone mangos as a localbranch..

git fetch git://github.com/mangos/mangos.git master:mangos

then..checkout to your work branch,merge with mangos branch with git GUI..