gistfile1.txt

$ ./script/gh-pages.sh 

remote: Counting objects: 303, done.
remote: Compressing objects: 100% (172/172), done.
remote: Total 248 (delta 182), reused 134 (delta 68)
Receiving objects: 100% (248/248), 41.88 KiB, done.
Resolving deltas: 100% (182/182), completed with 45 local objects.
From github.com:concord-consortium/lab
   4b6c277..01d3c22  gh-pages   -> origin/gh-pages
   b4b018a..10f47ea  master     -> origin/master
Updating 4b6c277..01d3c22
error: Your local changes to the following files would be overwritten by merge:
    doc/lennard-jones-potential/application.css
    examples/complex-atoms-model/application.js
    examples/complex-atoms-model/complex-atoms-model.html

    [... lots more changes]

    lab/lab.min.js
    lab/lab.molecules.js
    lab/lab.molecules.min.js
    readme.html
Please, commit your changes or stash them before you can merge.
error: The following untracked working tree files would be overwritten by merge:
    examples/mw-parsers/application.js
    examples/mw-parsers/mml-parser.html
    lab/lab.mw-helpers.js
Please move or remove them before you can merge.
Aborting
bash -O extglob -c 'rm -rf dist/* dist/.!(git|.|)'
rm -rf lab
rm -rf node_modules
git submodule update --init --recursive

[....]

[gh-pages 91ccc53] gh-pages generated from 10f47ea3fb265ef074f549db99a6c33c41a82ca5
 21 files changed, 924 insertions(+), 194 deletions(-)
 create mode 100644 examples/mw-parsers/application.js
 create mode 100644 examples/mw-parsers/mml-parser.html
 rewrite lab/lab.controllers.min.js (60%)
 rewrite lab/lab.layout.min.js (99%)
 rewrite lab/lab.min.js (67%)
 create mode 100644 lab/lab.mw-helpers.js
To git@github.com:concord-consortium/lab.git
 ! [rejected]        gh-pages -> gh-pages (non-fast-forward)
error: failed to push some refs to 'git@github.com:concord-consortium/lab.git'
To prevent you from losing history, non-fast-forward updates were rejected