Skip to content

Instantly share code, notes, and snippets.

@ss23

ss23/gist:5945350

Created July 7, 2013 23:19
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save ss23/5945350 to your computer and use it in GitHub Desktop.
Save ss23/5945350 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1.txt
$ git reset .gitignore
Unstaged changes after reset:
M .gitignore
$ git checkout .gitignore
$ git pull
You have not concluded your merge (MERGE_HEAD exists).
Please, commit your changes before you can merge.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment