ex
.. code-block:: bash git checkout gh-pages git merge -s ours master git checkout master git merge gh-pages