If you use Git, you just run git merge. If not, uupdate gives a good enough result for further fine tuning.