updated exercise to include git pull before push; updated broken imag…

…e link
ICESAT-2HackWeek · Jun 11, 2020 · c859674 · c859674
1 parent 711d76a
commit c859674
Showing 1 changed file with 12 additions and 35 deletions.
diff --git a/collaboration-exercise.ipynb b/collaboration-exercise.ipynb
@@ -58,10 +58,7 @@
    "cell_type": "code",
    "execution_count": null,
    "metadata": {
-    "collapsed": true,
-    "jupyter": {
-     "outputs_hidden": true
-    }
+    "collapsed": true
    },
    "outputs": [],
    "source": [
@@ -85,10 +82,7 @@
    "cell_type": "code",
    "execution_count": null,
    "metadata": {
-    "collapsed": true,
-    "jupyter": {
-     "outputs_hidden": true
-    }
+    "collapsed": true
    },
    "outputs": [],
    "source": [
@@ -109,10 +103,7 @@
    "cell_type": "code",
    "execution_count": null,
    "metadata": {
-    "collapsed": true,
-    "jupyter": {
-     "outputs_hidden": true
-    }
+    "collapsed": true
    },
    "outputs": [],
    "source": [
@@ -142,10 +133,7 @@
    "cell_type": "code",
    "execution_count": null,
    "metadata": {
-    "collapsed": true,
-    "jupyter": {
-     "outputs_hidden": true
-    }
+    "collapsed": true
    },
    "outputs": [],
    "source": [
@@ -158,10 +146,7 @@
    "cell_type": "code",
    "execution_count": null,
    "metadata": {
-    "collapsed": true,
-    "jupyter": {
-     "outputs_hidden": true
-    }
+    "collapsed": true
    },
    "outputs": [],
    "source": [
@@ -183,10 +168,7 @@
    "cell_type": "code",
    "execution_count": null,
    "metadata": {
-    "collapsed": true,
-    "jupyter": {
-     "outputs_hidden": true
-    }
+    "collapsed": true
    },
    "outputs": [],
    "source": [
@@ -204,10 +186,7 @@
    "cell_type": "code",
    "execution_count": null,
    "metadata": {
-    "collapsed": true,
-    "jupyter": {
-     "outputs_hidden": true
-    }
+    "collapsed": true
    },
    "outputs": [],
    "source": [
@@ -220,7 +199,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "The above command will never complete when run in the iPython notebook, because running git push will prompt for your git username and password, which the jupyter notebook can't pass thru... but you can run it on a console, and enter your info from the prompt."
+    "The above command will generally not complete when run in the iPython notebook, because running git push will prompt for your git username and password, which the jupyter notebook can't pass thru... but you can run it on a console, and enter your info from the prompt."
    ]
   },
   {
@@ -250,14 +229,15 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Generally, it's best practice to create a new branch for the feature you're adding of the bug that you are fixing. This is so that you can work on multiple seperate features if you'd like. Say for example, you're working on a new algorithm that will take several months to finish...but have a smaller change you want to make (and push) in the meantime. For now, we'll just branch to our github user name: \n",
+    "Generally, it's best practice to create a new branch for the feature you're adding of the bug that you are fixing. This is so that you can work on multiple seperate features if you'd like. Say for example, you're working on a new algorithm that will take several months to finish...but have a smaller change you want to make (and push) in the meantime. For now, we'll just branch to our github user name--note that we git pull before git pushing, to make sure we're on the most recent version of the repo. \n",
     "\n",
     "```\n",
     "git branch espg\n",
     "git checkout espg\n",
     "touch espg.txt\n",
     "git add espg.txt\n",
     "git commit -m \"changed files\"\n",
+    "git pull\n",
     "git push\n",
     "```"
    ]
@@ -276,7 +256,7 @@
     "\n",
     "*Mark down interface*\n",
     "\n",
-    "![PR Form](images/PR_Form.png)\n",
+    "![PR Form](images/PR_form.png)\n",
     "\n",
     "This **PR** workflow is actually pretty common, since it puts a review step in place--it's how the tutorials you're using were put together by the instructors. Once the repo owners who have read/write access decide, your code is merged. Until then, you can see your pull request listed on *their* repo, and other people can comment and view your work. \n",
     "\n",
@@ -320,10 +300,7 @@
    "cell_type": "code",
    "execution_count": null,
    "metadata": {
-    "collapsed": true,
-    "jupyter": {
-     "outputs_hidden": true
-    }
+    "collapsed": true
    },
    "outputs": [],
    "source": []