I'm on branch master and the file mwo.md was edited
git status
# On branch master
# Your branch is ahead of 'origin/master' by 10 commits.
# (use "git push" to publish your local commits)
#
# Changes not staged for commit:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
#
# modified: mwo.md
git add -u
# On branch master
# Your branch is ahead of 'origin/master' by 10 commits.
# (use "git push" to publish your local commits)
#
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# modified: mwo.md
git commit -m "testing makespec worflow"
[master 39655ec] testing makespec worflow
1 file changed, 1 deletion(-)
git status
# On branch master
# Your branch is ahead of 'origin/master' by 11 commits.
# (use "git push" to publish your local commits)
#
nothing to commit, working directory clean
make html
Creating movingwall.html...
git status
# On branch master
# Your branch is ahead of 'origin/master' by 11 commits.
# (use "git push" to publish your local commits)
#
# Changes not staged for commit:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
#
# modified: movingwall-tmp.md
#
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# movingwall.html
git add .
git status
# On branch master
# Your branch is ahead of 'origin/master' by 11 commits.
# (use "git push" to publish your local commits)
#
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# modified: movingwall-tmp.md
# new file: movingwall.html
git commit -m "testing makespec worflow"
[master d4c294a] testing makespec worflow
2 files changed, 254 insertions(+), 2 deletions(-)
create mode 100644 movingwall.html
git status
# On branch master
# Your branch is ahead of 'origin/master' by 12 commits.
# (use "git push" to publish your local commits)
#
nothing to commit, working directory clean
make website
Creating movingwall.html...
rapper: Parsing URI file:///home/sbb-zdb/cklee/movingwall/movingwall-tmp.ttl with parser guess
rapper: Serializing with serializer turtle
rapper: Guessed parser name 'turtle'
rapper: Parsing returned 30 triples
rapper: Parsing URI file:///home/sbb-zdb/cklee/movingwall/movingwall-tmp.ttl with parser guess
rapper: Serializing with serializer rdfxml
rapper: Guessed parser name 'turtle'
rapper: Parsing returned 30 triples
new revision to be shown at https://github.com/cKlee/movingwall/
error: Your local changes to the following files would be overwritten by checkout:
movingwall-tmp.ttl
Please, commit your changes or stash them before you can switch branches.
Aborting
fatal: A branch named 'gh-pages' already exists.
make: *** [website] Error 128
git status
# On branch master
# Your branch is ahead of 'origin/master' by 12 commits.
# (use "git push" to publish your local commits)
#
# Changes not staged for commit:
# (use "git add/rm <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
#
# deleted: movingwall-7d21d19.html
# deleted: movingwall-7d21d19.owl
# deleted: movingwall-7d21d19.ttl
# modified: movingwall-tmp.ttl
# deleted: movingwall.html
#
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# movingwall-39655ec.html
# movingwall-39655ec.owl
# movingwall-39655ec.ttl
git add -u
git status
# On branch master
# Your branch is ahead of 'origin/master' by 12 commits.
# (use "git push" to publish your local commits)
#
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# deleted: movingwall-7d21d19.html
# deleted: movingwall-7d21d19.owl
# deleted: movingwall-7d21d19.ttl
# modified: movingwall-tmp.ttl
# deleted: movingwall.html
#
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# movingwall-39655ec.html
# movingwall-39655ec.owl
# movingwall-39655ec.ttl
git commit -m "testing makespec worflow"
[master 11e6c7a] testing makespec worflow
5 files changed, 649 deletions(-)
delete mode 100644 movingwall-7d21d19.html
delete mode 100644 movingwall-7d21d19.owl
delete mode 100644 movingwall-7d21d19.ttl
delete mode 100644 movingwall.html
make website
Creating movingwall.html...
rapper: Parsing URI file:///home/sbb-zdb/cklee/movingwall/movingwall-tmp.ttl with parser guess
rapper: Serializing with serializer turtle
rapper: Guessed parser name 'turtle'
rapper: Parsing returned 30 triples
rapper: Parsing URI file:///home/sbb-zdb/cklee/movingwall/movingwall-tmp.ttl with parser guess
rapper: Serializing with serializer rdfxml
rapper: Guessed parser name 'turtle'
rapper: Parsing returned 30 triples
new revision to be shown at https://github.com/cKlee/movingwall/
M makespec
Switched to branch 'gh-pages'
[gh-pages 94e958d] revision 39655ec
4 files changed, 286 insertions(+), 31 deletions(-)
create mode 100644 movingwall-39655ec.html
Switched to branch 'master'
Your branch is ahead of 'origin/master' by 13 commits.
(use "git push" to publish your local commits)
Now I can finally push. But this is obviously not the nicest workflow. What I'm doing wrong?