File "/home/dragonlord/SmokeDetector/datahandling.py", line 21, in _load_pickle
    return pickle.load(f, encoding=encoding)


KeyboardInterrupt
2017-11-08 05:38:44.717225 UTC
  File "ws.py", line 144, in <module>
    time.sleep(3)


sh.ErrorReturnCode_1:

  RAN: /usr/bin/git checkout deploy

  STDOUT:
watched_keywords.txt: needs merge


  STDERR:
error: you need to resolve your current index first
2017-11-23 02:55:56.920025 UTC
  File "/home/dragonlord/SmokeDetector/chatcommunicate.py", line 189, in watcher

  RAN: /usr/bin/git checkout deploy

  STDOUT:
watched_keywords.txt: needs merge


  STDERR:
error: you need to resolve your current index first

[21:58:33] watched_keywords.txt:1488:need more than 1 value to unpack
[21:58:33] watched_keywords.txt:1490:need more than 1 value to unpack
[21:58:33] watched_keywords.txt:1699:need more than 1 value to unpack
[21:58:35] watched_keywords.txt:1488:need more than 1 value to unpack
[21:58:35] watched_keywords.txt:1490:need more than 1 value to unpack
[21:58:35] watched_keywords.txt:1699:need more than 1 value to unpack

>>>>>>> 2a085a55ab5929966eef3fabfab421f56b9700eb

dragonlord@smokedetector1:~/SmokeDetector> git reset --hard HEAD~2
HEAD is now at 5bb1f7c7 Merge pull request #1187 from Charcoal-SE/auto-blacklist-1509430457.1949418
dragonlord@smokedetector1:~/SmokeDetector> git pull
Enter passphrase for key '/home/dragonlord/.ssh/id_rsa':
Updating 5bb1f7c7..2a085a55
Fast-forward
 bad_keywords.txt          |  76 ++++++++++++++++++--
 blacklisted_usernames.txt |   7 +-
 blacklisted_websites.txt  |  53 +++++++++++++-
 bodyfetcher.py            |   3 +-
 findspam.py               |   4 +-

  STDERR:
error: you need to resolve your current index first
2017-11-23 02:55:56.920025 UTC
  File "/home/dragonlord/SmokeDetector/chatcommunicate.py", line 189, in watcher
    message_id=message_id)

  File "/home/dragonlord/SmokeDetector/chatcommunicate.py", line 275, in handle_commands
    return cmds[command](**command_parameters)

  File "/home/dragonlord/SmokeDetector/chatcommands.py", line 406, in command_blacklist_keyword
    ev_user_name=ev_user_name, ev_room=ev_room, ev_user_id=ev_user_id, wrap2=wrap2)