Skip to content

Instantly share code, notes, and snippets.

@jsam

jsam/gist:6163429

Created August 6, 2013 10:31
Show Gist options
  • Save jsam/6163429 to your computer and use it in GitHub Desktop.
Save jsam/6163429 to your computer and use it in GitHub Desktop.
Download ZIP
ex
Raw
gistfile1.txt
.. code-block:: bash
git checkout gh-pages
git merge -s ours master
git checkout master
git merge gh-pages
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment