sync branch

[mrdoob]

sync branch

[mrdoob]

It depends of which git client you're using. you should be able to get most of the tips from here: http://help.github.com/

I'm reading through it right now! Have never been working with any Version Control System, or Github in particular. If there's anything I don't understand that's relevant to three.js I will post back here.

Okay, so "git fetch origin" and then "git merge origin/master" should do it (provided that my "git remote -v" has "origin https://github.com/mrdoob/three.js.git (fetch)" in it) for a local branch.

However, what if I want to keep my Github fork up to date? Can I do that directly from the webclient? Or should I first locally clone my Github fork, then clone yours into a new local branch, run a merge from your branch into mine, and then pull my local up to my Github fork? (If I understand correctly ;-))

[mrdoob]

You just need to merge my branch with your local branch.

I recommend you use one of these clients:

• Windows: http://code.google.com/p/tortoisegit/
• MacOS: http://gitx.frim.nl/
• Linux: http://trac.novowork.com/gitg/

It'll make things simpler.

(I use Linux)
I do understand how the merging works (that's the fetch & merge), but the latter part of my question was about the Github fork (exactly this one https://github.com/fabricasapiens/three.js).
I can't merge your repo directly with mine via the webinterface, right?

[mrdoob]

I use Linux too and I use gitg. As far as I know you can't do too much with the webinterface here.

Trust me, use gitg ;)

I guess I should trust you then ;-) Trying out GitG tomorrow! Thanks for pointing me in the right direction...!
And by the way: the Github help is the best intro into versioncontrol I've ever seen :-)