Skip to content

Instantly share code, notes, and snippets.

@boxbeatsy

boxbeatsy/gist:5615af752336e4c34ce74ecee19ff313 Secret

Created December 15, 2016 19:50
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 boxbeatsy/5615af752336e4c34ce74ecee19ff313 to your computer and use it in GitHub Desktop.
Save boxbeatsy/5615af752336e4c34ce74ecee19ff313 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1.txt
Command: git pull realorigin master -s ignore-all-space
Results in:
memcached -vv -p 11211
<<<<<<< HEAD
=======
>>>>>>> ee525eb53f314735cf34390910cb2ee680b43f53
source venv/bin/activate
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment