git history for common problem

gistfile1.txt

dbc20 chai (static_pages) $  git status
# On branch static_pages
# 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)
#
#	modified:   app/assets/stylesheets/application.css
#	modified:   app/views/contact/new.html.erb
#	modified:   app/views/layouts/application.html.erb
#	deleted:    app/views/pages/index.html.erb
#	modified:   app/views/shops/index.html.erb
#	modified:   config/initializers/devise.rb
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	app/views/users/
no changes added to commit (use "git add" and/or "git commit -a")
dbc20 chai (static_pages) $ git add .
dbc20 chai (static_pages) $ git commit -m"header line and nav padding"
[static_pages a0ffb00] header line and nav padding
 16 files changed, 195 insertions(+), 23 deletions(-)
 create mode 100644 app/views/users/confirmations/new.html.erb
 create mode 100644 app/views/users/mailer/confirmation_instructions.html.erb
 create mode 100644 app/views/users/mailer/reset_password_instructions.html.erb
 create mode 100644 app/views/users/mailer/unlock_instructions.html.erb
 create mode 100644 app/views/users/passwords/edit.html.erb
 create mode 100644 app/views/users/passwords/new.html.erb
 create mode 100644 app/views/users/registrations/edit.html.erb
 create mode 100644 app/views/users/registrations/new.html.erb
 create mode 100644 app/views/users/sessions/new.html.erb
 create mode 100644 app/views/users/shared/_links.erb
 create mode 100644 app/views/users/unlocks/new.html.erb
dbc20 chai (static_pages) $ git pull origin master
remote: Counting objects: 33, done.
remote: Compressing objects: 100% (14/14), done.
remote: Total 28 (delta 11), reused 26 (delta 11)
Unpacking objects: 100% (28/28), done.
From github.com:shopfinder/chai
 * branch            master     -> FETCH_HEAD
error: There was a problem with the editor 'vim'.
Not committing merge; use 'git commit' to complete the merge.
dbc20 chai (static_pages|MERGING) $ 
dbc20 chai (static_pages|MERGING) $ git commit -m"header line and nav padding"
[static_pages 1d3e119] header line and nav padding
dbc20 chai (static_pages) $ git pull
From github.com:shopfinder/chai
   a349475..dd5130a  master     -> origin/master
   d03c75d..46a3576  starting_up -> origin/starting_up
There is no tracking information for the current branch.
Please specify which branch you want to merge with.
See git-pull(1) for details

    git pull <remote> <branch>

If you wish to set tracking information for this branch you can do so with:

    git branch --set-upstream static_pages origin/<branch>

dbc20 chai (static_pages) $ git co -b master
fatal: A branch named 'master' already exists.
dbc20 chai (static_pages) $ git co master
Switched to branch 'master'
Your branch is behind 'origin/master' by 13 commits, and can be fast-forwarded.
dbc20 chai (master) $ git pull
First, rewinding head to replay your work on top of it...
Fast-forwarded master to dd5130a46679c22d8e7f2d737a6b529afdad2f82.
dbc20 chai (master) $ git co static_pages 
Switched to branch 'static_pages'
dbc20 chai (static_pages) $ git pull
There is no tracking information for the current branch.
Please specify which branch you want to merge with.
See git-pull(1) for details

    git pull <remote> <branch>

If you wish to set tracking information for this branch you can do so with:

    git branch --set-upstream static_pages origin/<branch>

dbc20 chai (static_pages) $ git merge master
Already up-to-date.
dbc20 chai (static_pages) $ git push 
Counting objects: 53, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (32/32), done.
Writing objects: 100% (37/37), 4.87 KiB, done.
Total 37 (delta 18), reused 0 (delta 0)
To git@github.com:shopfinder/chai.git
   f9cdc6a..1d3e119  static_pages -> static_pages
dbc20 chai (static_pages) $ git co master
error: Your local changes to the following files would be overwritten by checkout:
	app/assets/stylesheets/application.css
	app/views/shops/index.html.erb
Please, commit your changes or stash them before you can switch branches.
Aborting
dbc20 chai (static_pages) $ git add .
dbc20 chai (static_pages) $ git commit -m"fixed application layout"
[static_pages 68399d5] fixed application layout
 2 files changed, 35 insertions(+), 40 deletions(-)
dbc20 chai (static_pages) $ git co master
Switched to branch 'master'
dbc20 chai (master) $ git pull
remote: Counting objects: 23, done.
remote: Compressing objects: 100% (6/6), done.
remote: Total 12 (delta 7), reused 8 (delta 6)
Unpacking objects: 100% (12/12), done.
From github.com:shopfinder/chai
   dd5130a..ccae340  master     -> origin/master
 * [new branch]      places     -> origin/places
First, rewinding head to replay your work on top of it...
Fast-forwarded master to ccae340120b450b0bafe534931d8401744c9b162.
dbc20 chai (master) $ git co sta
starting_up    static_pages   
dbc20 chai (master) $ git co sta
starting_up    static_pages   
dbc20 chai (master) $ git co static_pages 
Switched to branch 'static_pages'
dbc20 chai (static_pages) $ git pull
There is no tracking information for the current branch.
Please specify which branch you want to merge with.
See git-pull(1) for details

    git pull <remote> <branch>

If you wish to set tracking information for this branch you can do so with:

    git branch --set-upstream static_pages origin/<branch>

dbc20 chai (static_pages) $ git merge master
error: There was a problem with the editor 'vim'.
Not committing merge; use 'git commit' to complete the merge.
dbc20 chai (static_pages|MERGING) $ 
dbc20 chai (static_pages|MERGING) $ git commit -m"fixed application layout"
[static_pages 3c2bd97] fixed application layout
dbc20 chai (static_pages) $ git merge master
Already up-to-date.