[unlimit]

You could do it manually, or you could use the merging / branching options available in github.

http://learn.github.com/p/branching.html

There's a great section about merging and merging conflicts here!