gistfile1.txt

skippy@marrs [~/public_html/system]# git status
# Not currently on any branch.
# 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:   admin/formcontrols/formcontrol_file.php
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	plugins/autop/error_log
no changes added to commit (use "git add" and/or "git commit -a")

skippy@marrs [~/public_html/system]# git pull
Enter passphrase for key '/home/skippy/.ssh/id_dsa':
remote: Counting objects: 2249, done.
remote: Compressing objects: 100% (702/702), done.
remote: Total 1953 (delta 1415), reused 1777 (delta 1246)
Receiving objects: 100% (1953/1953), 584.60 KiB, done.
Resolving deltas: 100% (1415/1415), completed with 151 local objects.
From github.com:/habari/system

• [new branch] 0.9 -> origin/0.9

• [new branch] 290 -> origin/290

• [new branch] caching_headers -> origin/caching_headers
  522100a..0c7f55d master -> origin/master

• [new branch] rest_api -> origin/rest_api

• [new branch] theme_installer -> origin/theme_installer

• [new branch] themebase -> origin/themebase

• [new tag] v0.9 -> v0.9
  You are not currently on a branch. Please specify which
  branch you want to merge with. See git-pull(1) for details.

  git pull

skippy@marrs [/public_html/system]# git checkout master
M admin/formcontrols/formcontrol_file.php
Previous HEAD position was cb9d951... Those en-us files weren't so unnecessary after all. Reverting their removal for now.
Switched to branch 'master'
Your branch is behind 'origin/master' by 984 commits, and can be fast-forwarded.
skippy@marrs [/public_html/system]# git pull
Enter passphrase for key '/home/skippy/.ssh/id_dsa':
Updating 25fa5a5..0c7f55d
error: Your local changes to the following files would be overwritten by merge:
admin/formcontrols/formcontrol_file.php
Please, commit your changes or stash them before you can merge.
Aborting