Skip to content

Instantly share code, notes, and snippets.

@skpy

skpy/gist:4120867

Created November 20, 2012 20:31
Show Gist options
  • Save skpy/4120867 to your computer and use it in GitHub Desktop.
Save skpy/4120867 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
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")
@skpy
Copy link
Author

skpy commented Nov 20, 2012

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment