Skip to content

Instantly share code, notes, and snippets.

@cxreg

cxreg/gist:118505

Created May 27, 2009 07:28
Show Gist options
  • Save cxreg/118505 to your computer and use it in GitHub Desktop.
Save cxreg/118505 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1.txt
count@bokonon:~/foobar/foo$ ls .git/MERGE_*
.git/MERGE_HEAD .git/MERGE_MODE .git/MERGE_MSG
count@bokonon:~/foobar/foo$ git pull
Already up-to-date.
count@bokonon:~/foobar/foo$ ls .git/MERGE_*
ls: cannot access .git/MERGE_*: No such file or directory
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment