jsam
8/6/2013 - 10:31 AM

ex

ex

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