Skip to content

Instantly share code, notes, and snippets.

/-

Created July 12, 2016 21:55
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 anonymous/e3cb946b37ead6d60eb59d4a7257afa1 to your computer and use it in GitHub Desktop.
Save anonymous/e3cb946b37ead6d60eb59d4a7257afa1 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
-
@ghost .dotfiles (master)$ git merge origin/master
error: The following untracked working tree files would be overwritten by merge:
.irssi/config
Please move or remove them before you can merge.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment