Develop

README.md

@@ -5,3 +5,5 @@
 
 Visit our site <https://www.starkitrobots.com/cvr> to check content.
 Course is online and will be carried out on our *[YouTube chanel](https://www.youtube.com/channel/UC0QPJgfg17wCqf4-hG_A5OA)*.
+New string in Readme
+New string in Readme

notebooks/github_hw1.ipynb

@@ -1,61 +1,300 @@
 {
- "cells": [
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "# Домашнее задание\n",
-    "Домашнее задание выполнять в этой тетрадке. \n",
-    "\n",
-    "- [ ] Сделать fork репозитория cvr_cource (https://github.com/StarkitRobots/cvr_course) - 1 балл\n",
-    "- [ ] Создать ветку update_readme - 1 балл\n",
-    "- [ ] Добавить одну строчку в README.md \n",
-    "- [ ] Запушить (git push) изменения в ветку update_readme - 3 балла\n",
-    "- [ ] Слить (merge) ветку update_readme в ветку develop - 1 балл\n",
-    "- [ ] Сохранить эту тетрадку с выполненной домашкой себе в репозиторий в ветку develop - 3 балла\n",
-    "- [ ] Слить (merge) ветку develop в ветку main - 1 балл"
-   ]
+  "nbformat": 4,
+  "nbformat_minor": 0,
+  "metadata": {
+    "kernelspec": {
+      "display_name": "Python 3",
+      "language": "python",
+      "name": "python3"
+    },
+    "language_info": {
+      "codemirror_mode": {
+        "name": "ipython",
+        "version": 3
+      },
+      "file_extension": ".py",
+      "mimetype": "text/x-python",
+      "name": "python",
+      "nbconvert_exporter": "python",
+      "pygments_lexer": "ipython3",
+      "version": "3.6.9"
+    },
+    "colab": {
+      "name": "github_hw1.ipynb",
+      "provenance": []
+    }
   },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "Материалы к семинару:\n",
-    "1. [Удачная модель ветвления](https://m.habr.com/ru/post/106912/)\n",
-    "2. [Зачем нужен Git](https://guides.hexlet.io/git-guide/)\n",
-    "3. [Самые популярные ошибки и их решения](https://tproger.ru/translations/most-common-git-screwupsquestions-and-solutions/)\n",
-    "4. [Ветвление](https://git-scm.com/book/ru/v2/%D0%92%D0%B5%D1%82%D0%B2%D0%BB%D0%B5%D0%BD%D0%B8%D0%B5-%D0%B2-Git-%D0%9E-%D0%B2%D0%B5%D1%82%D0%B2%D0%BB%D0%B5%D0%BD%D0%B8%D0%B8-%D0%B2-%D0%B4%D0%B2%D1%83%D1%85-%D1%81%D0%BB%D0%BE%D0%B2%D0%B0%D1%85)\n",
-    "5. [Инструкция по всему Git](https://git-scm.com/book/ru/v2)\n",
-    "6. [Приложение для обучения Git](https://learngitbranching.js.org/?locale=ru_RU), спасибо Анне Касаткиной за ссылку на отличный материал"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": []
-  }
- ],
- "metadata": {
-  "kernelspec": {
-   "display_name": "Python 3",
-   "language": "python",
-   "name": "python3"
-  },
-  "language_info": {
-   "codemirror_mode": {
-    "name": "ipython",
-    "version": 3
-   },
-   "file_extension": ".py",
-   "mimetype": "text/x-python",
-   "name": "python",
-   "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3",
-   "version": "3.6.9"
-  }
- },
- "nbformat": 4,
- "nbformat_minor": 4
-}
+  "cells": [
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "0RHsRJCIjcfe"
+      },
+      "source": [
+        "# Домашнее задание\n",
+        "Домашнее задание выполнять в этой тетрадке. \n",
+        "\n",
+        "- [ ] Сделать fork репозитория cvr_cource (https://github.com/StarkitRobots/cvr_course) - 1 балл\n",
+        "- [ ] Создать ветку update_readme - 1 балл\n",
+        "- [ ] Добавить одну строчку в README.md \n",
+        "- [ ] Запушить (git push) изменения в ветку update_readme - 3 балла\n",
+        "- [ ] Слить (merge) ветку update_readme в ветку develop - 1 балл\n",
+        "- [ ] Сохранить эту тетрадку с выполненной домашкой себе в репозиторий в ветку develop - 3 балла\n",
+        "- [ ] Слить (merge) ветку develop в ветку main - 1 балл"
+      ]
+    },
+    {
+      "cell_type": "markdown",
+      "metadata": {
+        "id": "aIMtnniCjcfn"
+      },
+      "source": [
+        "Материалы к семинару:\n",
+        "1. [Удачная модель ветвления](https://m.habr.com/ru/post/106912/)\n",
+        "2. [Зачем нужен Git](https://guides.hexlet.io/git-guide/)\n",
+        "3. [Самые популярные ошибки и их решения](https://tproger.ru/translations/most-common-git-screwupsquestions-and-solutions/)\n",
+        "4. [Ветвление](https://git-scm.com/book/ru/v2/%D0%92%D0%B5%D1%82%D0%B2%D0%BB%D0%B5%D0%BD%D0%B8%D0%B5-%D0%B2-Git-%D0%9E-%D0%B2%D0%B5%D1%82%D0%B2%D0%BB%D0%B5%D0%BD%D0%B8%D0%B8-%D0%B2-%D0%B4%D0%B2%D1%83%D1%85-%D1%81%D0%BB%D0%BE%D0%B2%D0%B0%D1%85)\n",
+        "5. [Инструкция по всему Git](https://git-scm.com/book/ru/v2)\n",
+        "6. [Приложение для обучения Git](https://learngitbranching.js.org/?locale=ru_RU), спасибо Анне Касаткиной за ссылку на отличный материал"
+      ]
+    },
+    {
+      "cell_type": "code",
+      "metadata": {
+        "id": "1T0ElmlHjcfo",
+        "colab": {
+          "base_uri": "https://localhost:8080/"
+        },
+        "outputId": "4d62cd28-5c10-4dc8-eb9a-3270dd423906"
+      },
+      "source": [
+        "!git clone https://github.com/Renass/cvr_course.git"
+      ],
+      "execution_count": 30,
+      "outputs": [
+        {
+          "output_type": "stream",
+          "text": [
+            "Cloning into 'cvr_course'...\n",
+            "remote: Enumerating objects: 4, done.\u001b[K\n",
+            "remote: Counting objects:  25% (1/4)\u001b[K\rremote: Counting objects:  50% (2/4)\u001b[K\rremote: Counting objects:  75% (3/4)\u001b[K\rremote: Counting objects: 100% (4/4)\u001b[K\rremote: Counting objects: 100% (4/4), done.\u001b[K\n",
+            "remote: Compressing objects: 100% (4/4), done.\u001b[K\n",
+            "remote: Total 494 (delta 0), reused 0 (delta 0), pack-reused 490\u001b[K\n",
+            "Receiving objects: 100% (494/494), 60.34 MiB | 35.05 MiB/s, done.\n",
+            "Resolving deltas: 100% (107/107), done.\n"
+          ],
+          "name": "stdout"
+        }
+      ]
+    },
+    {
+      "cell_type": "code",
+      "metadata": {
+        "id": "Hy4LqOrEj5n-",
+        "colab": {
+          "base_uri": "https://localhost:8080/"
+        },
+        "outputId": "afdaa6eb-7cb1-4769-e21a-8930e1efaa2f"
+      },
+      "source": [
+        "cd cvr_course/"
+      ],
+      "execution_count": 31,
+      "outputs": [
+        {
+          "output_type": "stream",
+          "text": [
+            "/content/cvr_course/cvr_course\n"
+          ],
+          "name": "stdout"
+        }
+      ]
+    },
+    {
+      "cell_type": "code",
+      "metadata": {
+        "id": "AqJWuM3wkNUN"
+      },
+      "source": [
+        "!git branch update_readme"
+      ],
+      "execution_count": 32,
+      "outputs": []
+    },
+    {
+      "cell_type": "code",
+      "metadata": {
+        "id": "wUckbe9lk1ud",
+        "colab": {
+          "base_uri": "https://localhost:8080/"
+        },
+        "outputId": "7db621ad-e37e-419e-f472-6a1ba0b39179"
+      },
+      "source": [
+        "!git checkout update_readme"
+      ],
+      "execution_count": 33,
+      "outputs": [
+        {
+          "output_type": "stream",
+          "text": [
+            "Switched to branch 'update_readme'\n"
+          ],
+          "name": "stdout"
+        }
+      ]
+    },
+    {
+      "cell_type": "code",
+      "metadata": {
+        "id": "_kx8C7NSkkMU"
+      },
+      "source": [
+        "!echo \"New string in Readme\">>README.md"
+      ],
+      "execution_count": 40,
+      "outputs": []
+    },
+    {
+      "cell_type": "code",
+      "metadata": {
+        "colab": {
+          "base_uri": "https://localhost:8080/"
+        },
+        "id": "z8dR31DjonOt",
+        "outputId": "eca04cae-76bb-4b03-889a-44197a5fedb8"
+      },
+      "source": [
+        "!cat README.md"
+      ],
+      "execution_count": 46,
+      "outputs": [
+        {
+          "output_type": "stream",
+          "text": [
+            "# Computer Vision in Robotics\n",
+            "\n",
+            "<img src=\"./.img/logo_for_form.png\" height=\"350\" />\n",
+            "\n",
+            "\n",
+            "Visit our site <https://www.starkitrobots.com/cvr> to check content.\n",
+            "Course is online and will be carried out on our *[YouTube chanel](https://www.youtube.com/channel/UC0QPJgfg17wCqf4-hG_A5OA)*.\n",
+            "New string in Readme\n",
+            "New string in Readme\n"
+          ],
+          "name": "stdout"
+        }
+      ]
+    },
+    {
+      "cell_type": "code",
+      "metadata": {
+        "id": "YhfW3BUilAe2"
+      },
+      "source": [
+        "!git add *"
+      ],
+      "execution_count": 42,
+      "outputs": []
+    },
+    {
+      "cell_type": "code",
+      "metadata": {
+        "id": "WCTGFTh-l63V"
+      },
+      "source": [
+        "!git config --global user.email \"you@example.com\"\r\n",
+        "!git config --global user.name \"Renas\""
+      ],
+      "execution_count": 43,
+      "outputs": []
+    },
+    {
+      "cell_type": "code",
+      "metadata": {
+        "id": "ex47gxKWlsmV",
+        "colab": {
+          "base_uri": "https://localhost:8080/"
+        },
+        "outputId": "a4868c68-1fe1-419b-ed69-92679dd0c55d"
+      },
+      "source": [
+        "!git commit -m \"Update readme\""
+      ],
+      "execution_count": 44,
+      "outputs": [
+        {
+          "output_type": "stream",
+          "text": [
+            "[update_readme a013214] Update readme\n",
+            " 1 file changed, 1 insertion(+)\n"
+          ],
+          "name": "stdout"
+        }
+      ]
+    },
+    {
+      "cell_type": "code",
+      "metadata": {
+        "id": "kFRKYAZzmKAd"
+      },
+      "source": [
+        "!git remote add origin-psk https://Renass:{keep in secret!}@github.com/Renass/cvr_course.git"
+      ],
+      "execution_count": 38,
+      "outputs": []
+    },
+    {
+      "cell_type": "code",
+      "metadata": {
+        "id": "VcXbPKIPs9vi"
+      },
+      "source": [
+        ""
+      ],
+      "execution_count": null,
+      "outputs": []
+    },
+    {
+      "cell_type": "code",
+      "metadata": {
+        "id": "enK1jN8Xs-Vt"
+      },
+      "source": [
+        ""
+      ],
+      "execution_count": null,
+      "outputs": []
+    },
+    {
+      "cell_type": "code",
+      "metadata": {
+        "id": "CgKzBgL1m4i9",
+        "colab": {
+          "base_uri": "https://localhost:8080/"
+        },
+        "outputId": "22b52576-83a6-444e-b980-dc5ac4c43332"
+      },
+      "source": [
+        "!git push origin-psk update_readme"
+      ],
+      "execution_count": 45,
+      "outputs": [
+        {
+          "output_type": "stream",
+          "text": [
+            "Counting objects: 3, done.\n",
+            "Delta compression using up to 2 threads.\n",
+            "Compressing objects:  33% (1/3)   \rCompressing objects:  66% (2/3)   \rCompressing objects: 100% (3/3)   \rCompressing objects: 100% (3/3), done.\n",
+            "Writing objects:  33% (1/3)   \rWriting objects:  66% (2/3)   \rWriting objects: 100% (3/3)   \rWriting objects: 100% (3/3), 300 bytes | 300.00 KiB/s, done.\n",
+            "Total 3 (delta 2), reused 0 (delta 0)\n",
+            "remote: Resolving deltas: 100% (2/2), completed with 2 local objects.\u001b[K\n",
+            "To https://github.com/Renass/cvr_course.git\n",
+            "   5deabe5..a013214  update_readme -> update_readme\n"
+          ],
+          "name": "stdout"
+        }
+      ]
+    }
+  ]
+}