howto using own branches in github?

[balrok]

hello, i hope somebody has already figured out some stuff, so i don't need to search for this.

1. i forked mangos, now i have the repo balrok/mangos with some branches in it, how can i update my master branch (this is original mangos) to the current masterbranch of mangos?

2. if i download mangos/mangos master and know a nice fork with some nice branches, how can i easily add them (i hope i can do it with git and not with adding some patches)

edit: at least i found a page where i can look for my problems: http://github.com/guides/Home