wyr4137/ICS5-Map — pull request #118 by coh (2013-01-30 03:37:09+00:00)
Title: Redo References for Spain

My YourCountry.html file was already deleted in my folder, but I followed the steps you listed to fix this problem and got this:

Christina-Oh-Mac:ics5-map Tina$ git commit -a -m 'redo references'
# On branch master
nothing to commit, working directory clean
Christina-Oh-Mac:ics5-map Tina$ git push origin master
Everything up-to-date

I than ran git pull upstream master to update and got:

Christina-Oh-Mac:ics5-map Tina$ git pull upstream master
From git://github.com/wyr4137/ICS5-Map
* branch master -> FETCH_HEAD
error: The following untracked working tree files would be overwritten by merge:
.DS_Store
Please move or remove them before you can merge.
Aborting

I'm not sure if this changed anything though.