From 58fc48a9f406e89e14f1fef0203a8aaa3e9ff2d6 Mon Sep 17 00:00:00 2001 From: Rhiannon Walker Date: Wed, 1 Feb 2017 14:51:24 -0600 Subject: [PATCH] added 5min append State exporing the usaddress package --- 5min append State.ipynb | 91 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/5min append State.ipynb b/5min append State.ipynb index d6d4d03..cd2d29e 100644 --- a/5min append State.ipynb +++ b/5min append State.ipynb @@ -964,6 +964,97 @@ "df['Address'].values.tolist()" ] }, + { + "cell_type": "code", + "execution_count": 24, + "metadata": { + "collapsed": false + }, + "outputs": [ + { + "name": "stderr", + "output_type": "stream", + "text": [ + "warning: LF will be replaced by CRLF in .ipynb_checkpoints/5min append State-checkpoint.ipynb.\n", + "The file will have its original line endings in your working directory.\n", + "warning: LF will be replaced by CRLF in 5min append State.ipynb.\n", + "The file will have its original line endings in your working directory.\n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "[master c370888] added 5min append State exporing the usaddress package\n", + " Committer: Rhiannon Walker \n", + "Your name and email address were configured automatically based\n", + "on your username and hostname. Please check that they are accurate.\n", + "You can suppress this message by setting them explicitly. Run the\n", + "following command and follow the instructions in your editor to edit\n", + "your configuration file:\n", + "\n", + " git config --global --edit\n", + "\n", + "After doing this, you may fix the identity used for this commit with:\n", + "\n", + " git commit --amend --reset-author\n", + "\n", + " 2 files changed, 1998 insertions(+)\n", + " create mode 100644 .ipynb_checkpoints/5min append State-checkpoint.ipynb\n", + " create mode 100644 5min append State.ipynb\n" + ] + }, + { + "name": "stderr", + "output_type": "stream", + "text": [ + "To https://github.com/WaylonWalker/15min_WomensMarch.git\n", + " ! [rejected] master -> master (fetch first)\n", + "error: failed to push some refs to 'https://github.com/WaylonWalker/15min_WomensMarch.git'\n", + "hint: Updates were rejected because the remote contains work that you do\n", + "hint: not have locally. This is usually caused by another repository pushing\n", + "hint: to the same ref. You may want to first integrate the remote changes\n", + "hint: (e.g., 'git pull ...') before pushing again.\n", + "hint: See the 'Note about fast-forwards' in 'git push --help' for details.\n" + ] + } + ], + "source": [ + "!git add .\n", + "!git commit -m \"added 5min append State exporing the usaddress package\"\n", + "!git push" + ] + }, + { + "cell_type": "code", + "execution_count": 25, + "metadata": { + "collapsed": false + }, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "Merge made by the 'recursive' strategy.\n", + " README.md | 8 ++++++++\n", + " 1 file changed, 8 insertions(+)\n", + " create mode 100644 README.md\n" + ] + }, + { + "name": "stderr", + "output_type": "stream", + "text": [ + "From https://github.com/WaylonWalker/15min_WomensMarch\n", + " 680e352..291d5f8 master -> origin/master\n" + ] + } + ], + "source": [ + "!git pull" + ] + }, { "cell_type": "code", "execution_count": null,