From 00392d0dd48ccc9eb08bb2c7214c7d046c756be3 Mon Sep 17 00:00:00 2001 From: Vyacheslav Date: Mon, 6 Oct 2025 14:57:07 +0300 Subject: [PATCH 1/7] First commit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 64ef33813a..b7d1e73ced 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Домашнее задание к занятию "`Название занятия`" - `Фамилия и имя студента` +# Домашнее задание к занятию "`Git`" - `Ефимов Вячеслав` ### Инструкция по выполнению домашнего задания From 79fb02798797d41695dabeee556dc5e1c93ba3d6 Mon Sep 17 00:00:00 2001 From: Vyacheslav Date: Mon, 6 Oct 2025 16:53:03 +0300 Subject: [PATCH 2/7] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=20.gitignore=20=D1=81=20=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=D0=B0=D0=BC=D0=B8=20=D0=B4=D0=BB=D1=8F=20*.pyc=20=D0=B8?= =?UTF-8?q?=20cache/?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000..e69de29bb2 From 9f4741cae20130e8c9ed2f9e0157cc263644587b Mon Sep 17 00:00:00 2001 From: Vyacheslav Date: Mon, 6 Oct 2025 16:59:53 +0300 Subject: [PATCH 3/7] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=20=D0=B1=D0=B0=D0=B7=D0=BE=D0=B2=D1=8B=D0=B9=20=D1=81?= =?UTF-8?q?=D0=BA=D1=80=D0=B8=D0=BF=D1=82=20test.sh?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test.sh | 2 ++ 1 file changed, 2 insertions(+) create mode 100755 test.sh diff --git a/test.sh b/test.sh new file mode 100755 index 0000000000..ca9ddc2c54 --- /dev/null +++ b/test.sh @@ -0,0 +1,2 @@ +#!/bin/bash +echo "Hello from test script!" From 4baa3f936d21e7b3d141b9c93f0d7a11e4c44d68 Mon Sep 17 00:00:00 2001 From: Vyacheslav Date: Mon, 6 Oct 2025 17:09:58 +0300 Subject: [PATCH 4/7] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BD=D0=BE=D0=B2=D0=B0=D1=8F=20=D1=84=D1=83?= =?UTF-8?q?=D0=BD=D0=BA=D1=86=D0=B8=D0=BE=D0=BD=D0=B0=D0=BB=D1=8C=D0=BD?= =?UTF-8?q?=D0=BE=D1=81=D1=82=D1=8C=20=D0=B2=20test.sh?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test.sh b/test.sh index ca9ddc2c54..49b7b1b5ec 100755 --- a/test.sh +++ b/test.sh @@ -1,2 +1,4 @@ #!/bin/bash echo "Hello from test script!" +# Добавляем новую функциональность +echo "Новая функция разработки" From 44168309cf31e5c02bd671574ea6134da1072900 Mon Sep 17 00:00:00 2001 From: Vyacheslav Date: Mon, 6 Oct 2025 17:13:25 +0300 Subject: [PATCH 5/7] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D1=82=D1=80=D0=B5=D1=82=D1=8C=D1=8F=20=D1=84?= =?UTF-8?q?=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D0=BE=D0=BD=D0=B0=D0=BB=D1=8C?= =?UTF-8?q?=D0=BD=D0=BE=D1=81=D1=82=D1=8C=20=D0=B2=20test.sh?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test.sh b/test.sh index 49b7b1b5ec..6517bafed4 100755 --- a/test.sh +++ b/test.sh @@ -2,3 +2,5 @@ echo "Hello from test script!" # Добавляем новую функциональность echo "Новая функция разработки" +# Добавляем ещё одну функциональность +echo "Третья функция разработки" From f1cd66e0012fb06e34153ddd2cc6a60ae8efa3c1 Mon Sep 17 00:00:00 2001 From: Vyacheslav Date: Mon, 6 Oct 2025 17:17:02 +0300 Subject: [PATCH 6/7] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=20=D0=BE=D1=81=D0=BD=D0=BE=D0=B2=D0=BD=D0=BE=D0=B9=20?= =?UTF-8?q?=D1=81=D0=BA=D1=80=D0=B8=D0=BF=D1=82=20main.sh?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.sh | 2 ++ 1 file changed, 2 insertions(+) create mode 100755 main.sh diff --git a/main.sh b/main.sh new file mode 100755 index 0000000000..f0a88d6968 --- /dev/null +++ b/main.sh @@ -0,0 +1,2 @@ +#!/bin/bash +echo "Основной скрипт проекта" From 9c1ceff4037f61e90e14633932d4c42d24d1e345 Mon Sep 17 00:00:00 2001 From: Vyacheslav Date: Mon, 6 Oct 2025 17:30:57 +0300 Subject: [PATCH 7/7] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F=20test.sh=20=D0=B2=20=D0=B2=D0=B5=D1=82=D0=BA?= =?UTF-8?q?=D0=B5=20conflict?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.sh b/test.sh index 6517bafed4..3604094241 100755 --- a/test.sh +++ b/test.sh @@ -1,5 +1,5 @@ #!/bin/bash -echo "Hello from test script!" +echo "Это версия из ветки CONFLICT - новые крутые возможности!" # Добавляем новую функциональность echo "Новая функция разработки" # Добавляем ещё одну функциональность