You can see both content (master
and gh-branch
) from the master
branch.
You would need for that to declare your gh-branch
as a submodule(!) in your master
branch.
That way, when you are in your master
branch, the gh-branch
is displayed as a sub-folder.
Once that setup is done (in command line), you can manage everything from Tower.
See "What's the easiest way to deploy a folder to a branch in git?" for the submodule setup.
Each modification in gh-branch
would then need to be committed, and you would need to go back in the main folder to commit (again), in order to record the gitlink (special entry mode 160000).
That way, each version of the master
branch knows which version of the gh-branch
it is supposed to work with.
Update August 2016: Simpler GitHub Pages publishing now allows to keep your page files in a subfolder of the same branch (no more gh-pages
needed):
So this is easier now: now need for two branches, you can do everything in one.