How to I sync two GitHub branches?

[Tim Cook]

I have my master branch and I want to get it in sync with my gh-pages branch. How do I do this in sourcetree?

[stevestreeting]

You have a choice between merging and rebasing, this blog post might be useful: http://blog.sourcetreeapp.com/2012/08/21/merge-or-rebase/

Usually, you'll want to merge if these are different branches and they're both visible on GitHub already. In SourceTree, you can use the Merge toolbar button to merge another branch into your current branch (so if you have master checked out, you could merge gh-pages into it), or you can right-click on a branch in either the sidebar or in the log and select 'Merge' to bring that branches changes into your current branch.