Git: changes not reflecting on other checkouts - huh?
- by Chad Johnson
Okay, so, I have my branches (git branch -a):
* chat
master
remotes/origin/HEAD -> origin/master
remotes/origin/chat
I make changes (still with the 'chat' branch checkout out), commit, and push.
I go to my server, on which I have a clone of the repository, and I do a fetch:
git getch
then I switch to the chat branch:
git checkout --track -b chat origin/chat
and I event do a pull, just to make sure everything is up to date:
git pull
and my changes from my other computer are NOT. THERE. What the heck am I doing wrong? If I had hair, I would have pulled it out. Thankfully I am bald.
When I try a 'git commit' again, I get this
# On branch chat
# Changed but not updated:
# (use "git add/rm <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
#
# modified: app/controllers/chat_controller.rb
# modified: app/views/dashboard/index.html.erb
# modified: app/views/dashboard/layout.js.erb
# modified: app/views/layouts/dashboard.html.erb
# deleted: app/views/project/.tmp_edit.html.erb.55742~
# deleted: app/views/project/.tmp_edit.html.erb.83482~
# modified: public/stylesheets/dashboard/layout.css
#
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# .loadpath
# .project
# config/database.yml
# config/environments/development.yml
# config/environments/production.yml
# config/environments/test.yml
# log/
no changes added to commit (use "git add" and/or "git commit -a")
