Error on repo creation

[mhkeller]

One repo didn't pull correctly on first push. Logs

a:    src/server.js:305 - error: you need to resolve your current index first
data:    src/server.js:305 - css/styles.css: needs merge
data:    src/server.js:305 - css/styles.styl: needs merge
data:    src/server.js:305 - error: you need to resolve your current index first
data:    src/server.js:305 - css/styles.css: needs merge
data:    src/server.js:305 - css/styles.styl: needs merge
data:    src/server.js:305 - error: you need to resolve your current index first
data:    src/server.js:305 - css/styles.css: needs merge
data:    src/server.js:305 - css/styles.styl: needs merge
data:    src/server.js:305 - error: you need to resolve your current index first
data:    src/server.js:305 - css/styles.css: needs merge
data:    src/server.js:305 - css/styles.styl: needs merge
data:    src/server.js:305 - error: you need to resolve your current index first
data:    src/server.js:305 - css/styles.css: needs merge
data:    src/server.js:305 - css/styles.styl: needs merge
data:    src/server.js:305 - error: you need to resolve your current index first
data:    src/server.js:305 - css/styles.css: needs merge
data:    src/server.js:305 - css/styles.styl: needs merge
data:    src/server.js:305 - error: you need to resolve your current index first
data:    src/server.js:305 - css/styles.css: needs merge
data:    src/server.js:305 - css/styles.styl: needs merge
data:    src/server.js:305 - error: you need to resolve your current index first
data:    src/server.js:305 - css/styles.css: needs merge
data:    src/server.js:305 - css/styles.styl: needs merge
data:    src/server.js:305 - error: pathspec 'master' did not match any file(s) known to git.
data:    src/server.js:305 - error: you need to resolve your current index first
data:    src/server.js:305 - css/styles.css: needs merge
data:    src/server.js:305 - css/styles.styl: needs merge
data:    src/server.js:305 - error: you need to resolve your current index first
data:    src/server.js:305 - css/styles.css: needs merge
data:    src/server.js:305 - css/styles.styl: needs merge
data:    src/server.js:305 - error: you need to resolve your current index first
data:    src/server.js:305 - css/styles.css: needs merge
data:    src/server.js:305 - css/styles.styl: needs merge
data:    src/server.js:305 - error: you need to resolve your current index first
data:    src/server.js:305 - css/styles.css: needs merge
data:    src/server.js:305 - css/styles.styl: needs merge
data:    src/server.js:305 - error: you need to resolve your current index first
data:    src/server.js:305 - css/styles.css: needs merge
data:    src/server.js:305 - css/styles.styl: needs merge
data:    src/server.js:305 - error: you need to resolve your current index first
data:    src/server.js:305 - css/styles.css: needs merge
data:    src/server.js:305 - css/styles.styl: needs merge
data:    src/server.js:305 - error: you need to resolve your current index first
data:    src/server.js:305 - css/styles.css: needs merge
data:    src/server.js:305 - css/styles.styl: needs merge
data:    src/server.js:305 - error: you need to resolve your current index first
data:    src/server.js:305 - css/styles.css: needs merge
data:    src/server.js:305 - css/styles.styl: needs merge
data:    src/server.js:305 - error: you need to resolve your current index first
data:    src/server.js:305 - css/styles.css: needs merge
data:    src/server.js:305 - css/styles.styl: needs merge
data:    src/server.js:305 - error: you need to resolve your current index first
data:    src/server.js:305 - css/styles.css: needs merge
data:    src/server.js:305 - css/styles.styl: needs merge
data:    src/server.js:305 - error: you need to resolve your current index first
data:    src/server.js:305 - css/styles.css: needs merge
data:    src/server.js:305 - css/styles.styl: needs merge
data:    src/server.js:305 - error: you need to resolve your current index first
data:    src/server.js:305 - css/styles.css: needs merge
data:    src/server.js:305 - css/styles.styl: needs merge
data:    src/server.js:305 - error: you need to resolve your current index first
data:    src/server.js:305 - css/styles.css: needs merge
data:    src/server.js:305 - css/styles.styl: needs merge
data:    src/server.js:305 - error: you need to resolve your current index first
data:    src/server.js:305 - css/styles.css: needs merge
data:    src/server.js:305 - css/styles.styl: needs merge
data:    src/server.js:305 - error: you need to resolve your current index first
data:    src/server.js:305 - css/styles.css: needs merge
data:    src/server.js:305 - css/styles.styl: needs merge
data:    src/server.js:305 - error: you need to resolve your current index first
data:    src/server.js:305 - css/styles.css: needs merge
data:    src/server.js:305 - css/styles.styl: needs merge
data:    src/server.js:305 - error: you need to resolve your current index first
data:    src/server.js:305 - css/styles.css: needs merge
data:    src/server.js:305 - css/styles.styl: needs merge
data:    src/server.js:305 - error: you need to resolve your current index first
data:    src/server.js:305 - css/styles.css: needs merge
data:    src/server.js:305 - css/styles.styl: needs merge
data:    src/server.js:305 - error: you need to resolve your current index first
data:    src/server.js:305 - css/styles.css: needs merge
data:    src/server.js:305 - css/styles.styl: needs merge
data:    src/server.js:305 - error: you need to resolve your current index first
data:    src/server.js:305 - css/styles.css: needs merge
data:    src/server.js:305 - css/styles.styl: needs merge
data:    src/server.js:305 - error: you need to resolve your current index first
data:    src/server.js:305 - css/styles.css: needs merge
data:    src/server.js:305 - css/styles.styl: needs merge
data:    src/server.js:305 - error: you need to resolve your current index first
data:    src/server.js:305 - css/styles.css: needs merge
data:    src/server.js:305 - css/styles.styl: needs merge
data:    src/server.js:305 - error: you need to resolve your current index first
data:    src/server.js:305 - css/styles.css: needs merge
data:    src/server.js:305 - css/styles.styl: needs merge
data:    src/server.js:305 - error: you need to resolve your current index first
data:    src/server.js:305 - css/styles.css: needs merge
data:    src/server.js:305 - css/styles.styl: needs merge
data:    src/server.js:305 - error: pathspec 'master' did not match any file(s) known to git.
data:    src/server.js:305 - error: pathspec 'master' did not match any file(s) known to git.

[mhkeller]

GitHub was adding a ping event which hookshot couldn't interpret. Patched locally, pull request in coreh/hookshot#10