updated instructions

gitlab-commit_and_push.ipynb

@@ -16,25 +16,43 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "# Run First\n",
+    "# Startup git\n",
     "\n",
-    "Replace /users/filepath/etc with the filepath of the local git directory you wish to work on."
+    "Replace /example/filepath/etc with the filepath of your git directory."
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "cd /example/filepath/etc"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Choose branch you would like to work on. (syntax: git checkout branch_name) \\\n",
+    "If you need to create a new branch, type this to create a branch and switch to it: git checkout -b branch_name"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
-    "cd /Users/filepath/etc"
+    "git checkout branch_name"
    ]
   },
   {
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Choose branch you would like to work on. (syntax: git checkout branch_name)"
+    "# Pull\n",
+    "Always pull before working on files with git to ensure you have the latest version. \n"
    ]
   },
   {
@@ -43,7 +61,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "git checkout develop"
+    "git pull origin branch_name"
    ]
   },
   {
@@ -67,12 +85,12 @@
    "metadata": {},
    "source": [
     "<h4>Step 2</h4>\n",
-    "Choose file to commit. Replace /example/filepath/etc with path of file you would like to commit. (Note: If you would like to commit multiple files at once with the same commit message, you can do so by adding the parent folder of all edited files. Git will only apply this commit message to files that have changes.)"
+    "Choose file to commit. Replace /example/filepath/etc with the filepath of the file you would like to commit. (Note: If you would like to commit multiple files at once with the same commit message, you can do so by adding the parent folder of all edited files.)"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -89,18 +107,9 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 6,
-   "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "[master 916ccdb] removed 96, deleted fiber\r\n",
-      " 3 files changed, 0 insertions(+), 0 deletions(-)\r\n"
-     ]
-    }
-   ],
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
    "source": [
     "git commit -m \"initial commit\""
    ]
@@ -110,14 +119,14 @@
    "metadata": {},
    "source": [
     "# Push\n",
-    "Use this to update files in the remote repository with your committed files. Note: You may run into errors if the local branch you are pushing does not have the same name as the remote branch you are pushing to (e.g. trying to push from a local branch named \"testing\" to a branch in the GitLab repository named \"develop\"). It is recommended you push from a branch with the same name as the remote branch you are trying to push to."
+    "Use this to update files in the remote repository with your committed files. Only try to push to branches with the same name as the one on your machine. (e.g. if you want to push a branch named \"nps-develop\", you should type \"git push origin nps-develop\")"
    ]
   },
   {
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "See a list of all files you have made commits to since your last push."
+    "(syntax: git push origin branch_name)"
    ]
   },
   {
@@ -126,38 +135,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "git status"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "(syntax: git push remote_name branch_name)"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 8,
-   "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "Enumerating objects: 13, done.\n",
-      "Counting objects: 100% (13/13), done.\n",
-      "Delta compression using up to 4 threads\n",
-      "Compressing objects: 100% (7/7), done.\n",
-      "Writing objects: 100% (7/7), 1.60 KiB | 1.60 MiB/s, done.\n",
-      "Total 7 (delta 6), reused 0 (delta 0)\n",
-      "To https://gitlab.nps.edu/CID/USVI/gis.git\n",
-      "   ea4ee4c..916ccdb  master -> master\n"
-     ]
-    }
-   ],
-   "source": [
-    "git push origin develop"
+    "git push origin branch_name"
    ]
   }
  ],