git fusionar anotehr

git checkout <the branch you you want to merge in to>

git merge <the branch you want contents from>
KostasX