From 4d546ec17807b815dd2f694bc1c4a25514da5d78 Mon Sep 17 00:00:00 2001 From: KhodiukMR Date: Mon, 1 Apr 2024 13:35:29 +0000 Subject: [PATCH] =?UTF-8?q?=D0=97=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=B8?= =?UTF-8?q?=D0=BB(=D0=B0)=20=D1=84=D0=B0=D0=B9=D0=BB=D1=8B=20=D0=B2=20''?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...»Π°Π±ΠΎΡ€Π°Ρ‚ΠΎΡ€Π½ΠΎΠΉ Ρ€Π°Π±ΠΎΡ‚Ρ‹ 2.txt | 712 ++++++++++++++++++ 1 file changed, 712 insertions(+) create mode 100644 ΠžΡ‚Ρ‡Ρ‘Ρ‚ для Π»Π°Π±ΠΎΡ€Π°Ρ‚ΠΎΡ€Π½ΠΎΠΉ Ρ€Π°Π±ΠΎΡ‚Ρ‹ 2.txt diff --git a/ΠžΡ‚Ρ‡Ρ‘Ρ‚ для Π»Π°Π±ΠΎΡ€Π°Ρ‚ΠΎΡ€Π½ΠΎΠΉ Ρ€Π°Π±ΠΎΡ‚Ρ‹ 2.txt b/ΠžΡ‚Ρ‡Ρ‘Ρ‚ для Π»Π°Π±ΠΎΡ€Π°Ρ‚ΠΎΡ€Π½ΠΎΠΉ Ρ€Π°Π±ΠΎΡ‚Ρ‹ 2.txt new file mode 100644 index 0000000..079a238 --- /dev/null +++ b/ΠžΡ‚Ρ‡Ρ‘Ρ‚ для Π»Π°Π±ΠΎΡ€Π°Ρ‚ΠΎΡ€Π½ΠΎΠΉ Ρ€Π°Π±ΠΎΡ‚Ρ‹ 2.txt @@ -0,0 +1,712 @@ +ΠžΡ‚Ρ‡Π΅Ρ‚ ΠΏΠΎ Π»Π°Π±ΠΎΡ€Π°Ρ‚ΠΎΡ€Π½ΠΎΠΉ Ρ€Π°Π±ΠΎΡ‚Π΅ β„– 2 "БистСма контроля вСрсий Git" + +Π’Ρ‹ΠΏΠΎΠ»Π½ΠΈΠ»: Π₯одюк М.Π . +Π“Ρ€ΡƒΠΏΠΏΠ°: А-01-23 +ΠŸΡ€ΠΎΠ²Π΅Ρ€ΠΈΠ»: Козлюк Π”. А. + +ΠŸΡ€ΠΈΠΌΠ΅Ρ‡Π°Π½ΠΈΠ΅: Ρ€Π°Π±ΠΎΡ‚Π° Π²Ρ‹ΠΏΠΎΠ»Π½ΡΠ»Π°ΡΡŒ Π½Π° Windows. + +1. Π’Ρ…ΠΎΠ΄ Π² Ρ‚Π΅Ρ€ΠΌΠΈΠ½Π°Π» ΠΈ созданиС структуры ΠΊΠ°Ρ‚Π°Π»ΠΎΠ³ΠΎΠ² +Π‘ΠΎΠ·Π΄Π°Π» Π½Π° Ρ€Π°Π±ΠΎΡ‡Π΅ΠΌ столС ΠΏΠ°ΠΏΠΊΡƒ lab02 ΠΈ ΠΎΡ‚ΠΊΡ€Ρ‹Π» Π² Π½Π΅ΠΉ Git Bash + +Π‘ΠΎΠ·Π΄Π°Π» 2 ΠΏΠ°ΠΏΠΊΠΈ Alice ΠΈ Bob: +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02 +$ mkdir Alice + +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02 +$ mkdir Bob + +ΠŸΠ΅Ρ€Π΅Ρ…ΠΎΠ΄ Π² ΠΊΠ°Ρ‚Π°Π»ΠΎΠ³ Alice ΠΈ созданиС project: +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02 +$ cd Alice + +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Alice +$ mkdir project + +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Alice +$ cd project + +Π’ΠΎΠ·Π²Ρ€Π°Ρ‰Π΅Π½ΠΈΠ΅ Π½Π° ΡƒΡ€ΠΎΠ²Π΅Π½ΡŒ Π²Ρ‹ΡˆΠ΅ ΠΈ ΠΏΠ΅Ρ€Π΅Ρ…ΠΎΠ΄ ΠΎΠ±Ρ€Π°Ρ‚Π½ΠΎ Π² ΠΊΠ°Ρ‚Π°Π»ΠΎΠ³ project: +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Alice/project +$ cd .. + +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Alice +$ cd project + +2. Π˜Π½ΠΈΡ†ΠΈΠ°Π»ΠΈΠ·Π°Ρ†ΠΈΡ рСпозитария ΠΈ настройка Git +Π˜Π½ΠΈΡ†ΠΈΠ°Π»ΠΈΠ·ΠΈΡ€ΠΎΠ²Π°Π» Ρ€Π΅ΠΏΠΎΠ·ΠΈΡ‚Π°Ρ€ΠΈΠΉ: +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Alice/project +$ git init +Initialized empty Git repository in C:/Users/MAKSIMKA/Desktop/lab02/Alice/project/.git/ + +Π”ΠΎΠ±Π°Π²ΠΈΠ» ΠΈΠ½ΠΈΡ†ΠΈΠ°Π»Ρ‹ ΠΈ email для Alice: +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Alice/project (master) +$ git config user.name 'Alice (KhodyukMR)' + +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Alice/project (master) +$ git config user.email 'KhodyukMR@mpei.ru' + +ПомСнял имя Π²Π΅Ρ‚ΠΊΠΈ Π½Π° main: +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Alice/project (master) +$ git branch -m main + +3.ЗанСсСниС Ρ„Π°ΠΉΠ»ΠΎΠ² ΠΏΠΎΠ΄ ΠΊΠΎΠ½Ρ‚Ρ€ΠΎΠ»ΡŒ вСрсий +ΠŸΠΎΡΠΌΠΎΡ‚Ρ€Π΅Π» состояниС Ρ€Π°Π±ΠΎΡ‡Π΅ΠΉ ΠΊΠΎΠΏΠΈΠΈ: +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Alice/project (main) +$ git status +On branch main + +No commits yet + +Untracked files: + (use "git add ..." to include in what will be committed) + .vs/ + main.cpp + project.sln + project.vcxproj + project.vcxproj.filters + project.vcxproj.user + +nothing added to commit but untracked files present (use "git add" to track) + +Π”ΠΎΠ±Π°Π²ΠΈΠ» Ρ„Π°ΠΉΠ» main.cpp Π² индСкс, Ρ‚ΠΎ Π΅ΡΡ‚ΡŒ Π² Π½Π°Π±ΠΎΡ€ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ, ΠΊΠΎΡ‚ΠΎΡ€Ρ‹ΠΉ Π²ΠΎΠΉΠ΄Π΅Ρ‚ Π² ΠΎΡ‡Π΅Ρ€Π΅Π΄Π½ΠΎΠΉ ΠΊΠΎΠΌΠΌΠΈΡ‚: +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Alice/project (main) +$ git add main.cpp + +Π‘Π½ΠΎΠ²Π° посмотрСл статус ΠΏΡ€ΠΎΠ΅ΠΊΡ‚Π° ΠΈ Π·Π°ΠΊΠΎΠΌΠΌΠΈΡ‚ΠΈΠ» созданиС ΠΏΡ€ΠΎΠ³Ρ€Π°ΠΌΠΌΡ‹: +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Alice/project (main) +$ git status +On branch main + +No commits yet + +Changes to be committed: + (use "git rm --cached ..." to unstage) + new file: main.cpp + +Untracked files: + (use "git add ..." to include in what will be committed) + .vs/ + project.sln + project.vcxproj + project.vcxproj.filters + project.vcxproj.user + project/ + x64/ + + +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Alice/project (main) +$ git commit -m "code: Π·Π°Π³ΠΎΡ‚ΠΎΠ²ΠΊΠ° ΠΏΡ€ΠΎΠ³Ρ€Π°ΠΌΠΌΡ‹" +[main (root-commit) 7ba6699] code: Π·Π°Π³ΠΎΡ‚ΠΎΠ²ΠΊΠ° ΠΏΡ€ΠΎΠ³Ρ€Π°ΠΌΠΌΡ‹ + 1 file changed, 1 insertion(+) + create mode 100644 main.cpp + +4. БоставлСниС сообщСний ΠΊ ΠΊΠΎΠΌΠΌΠΈΡ‚Π°ΠΌ +Π”ΠΎΠ±Π°Π²ΠΈΠ» Ρ„Π°ΠΉΠ» project.sln Π² индСкс ΠΈ сдСлал ΠΊΠΎΠΌΠΌΠΈΡ‚ с Π½ΠΈΠΌ: +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Alice/project (main) +$ git add project.sln + +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Alice/project (main) +$ git commit -m "build: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Ρ„Π°ΠΉΠ» ΠΏΡ€ΠΎΠ΅ΠΊΡ‚Π°" +[main 8656625] build: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Ρ„Π°ΠΉΠ» ΠΏΡ€ΠΎΠ΅ΠΊΡ‚Π° + 1 file changed, 31 insertions(+) + create mode 100644 project.sln + +5.Π‘ΠΎΠ·Π΄Π°Π½ΠΈΠ΅ ΠΊΠΎΠΌΠΌΠΈΡ‚ΠΎΠ² с измСнСниями +ИзмСнил main.cpp, Π½ΠΎ Π½Π΅ Π΄ΠΎΠ±Π°Π²ΠΈΠ» Π΅Π³ΠΎ Π² git, ΠΏΡ€ΠΎΠ²Π΅Ρ€ΠΈΠ» статус рСпозитария: +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Alice/project (main) +$ git status +On branch main +Changes not staged for commit: + (use "git add ..." to update what will be committed) + (use "git restore ..." to discard changes in working directory) + modified: main.cpp + +Untracked files: + (use "git add ..." to include in what will be committed) + .vs/ + project.vcxproj + project.vcxproj.filters + project.vcxproj.user + project/ + x64/ + +no changes added to commit (use "git add" and/or "git commit -a") + +Π‘Π΄Π΅Π»Π°Π» ΠΊΠΎΠΌΠΌΠΈΡ‚, Π²ΠΊΠ»ΡŽΡ‡Π°ΡŽΡ‰ΠΈΠΉ Π² сСбя ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠ΅ Π² main.cpp: +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Alice/project (main) +$ git add main.cpp + +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Alice/project (main) +$ git commit -m "code: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Π²Π²ΠΎΠ΄ чисСл" +[main 8c3620a] code: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Π²Π²ΠΎΠ΄ чисСл + 1 file changed, 8 insertions(+), 1 deletion(-) + +Π”ΠΎΠ±Π°Π²ΠΈΠ» Π²Ρ‹Π²ΠΎΠ΄ суммы чисСл Π² ΠΏΡ€ΠΎΠ³Ρ€Π°ΠΌΠΌΡƒ ΠΈ сдСлал ΠΊΠΎΠΌΠΌΠΈΡ‚ Π΄Ρ€ΡƒΠ³ΠΈΠΌ способом: +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Alice/project (main) +$ git add -u + +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Alice/project (main) +$ git commit -m "code: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Π²Ρ‹Π²ΠΎΠ΄ суммы" +[main 8b42ef9] code: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Π²Ρ‹Π²ΠΎΠ΄ суммы + 1 file changed, 1 insertion(+) + +Π”ΠΎΠ±Π°Π²ΠΈΠ» Π²Ρ‹Π²ΠΎΠ΄ разности ΠΈ сдСлал ΠΊΠΎΠΌΠΌΠΈΡ‚ с Π½ΠΈΠΌ Π² ΠΎΠ΄Π½Ρƒ строку: +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Alice/project (main) +$ git commit -a -m "code: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Π²Ρ‹Π²ΠΎΠ΄ разности" +[main 9c6c79e] code: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Π²Ρ‹Π²ΠΎΠ΄ разности + 1 file changed, 2 insertions(+), 1 deletion(-) + +6. Π˜Π³Π½ΠΎΡ€ΠΈΡ€ΠΎΠ²Π°Π½ΠΈΠ΅ Ρ„Π°ΠΉΠ»ΠΎΠ² +Π‘ΠΎΠ·Π΄Π°ΠΌ Π² ΠΊΠ°Ρ‚Π°Π»ΠΎΠ³Π΅ project Ρ„Π°ΠΉΠ» с Ρ€Π°ΡΡˆΠΈΡ€Π΅Π½ΠΈΠ΅ΠΌ .gitignore ΠΈ занСсу Π² Π½Π΅Π³ΠΎ всС лишниС Ρ„Π°ΠΉΠ»Ρ‹, ΠΊΠΎΡ‚ΠΎΡ€Ρ‹Π΅ Π½Π΅ Π΄ΠΎΠ»ΠΆΠ½Ρ‹ Π½Π°Ρ…ΠΎΠ΄ΠΈΡ‚ΡŒΡΡ ΠΏΠΎΠ΄ ΠΊΠΎΠ½Ρ‚Ρ€ΠΎΠ»Π΅ΠΌ вСрсий +ΠŸΡ€ΠΎΠ²Π΅Ρ€ΠΈΠ» статус ΠΏΡ€ΠΎΠ΅ΠΊΡ‚Π°: +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Alice/project (main) +$ git status +On branch main +Untracked files: + (use "git add ..." to include in what will be committed) + .gitignore + +nothing added to commit but untracked files present (use "git add" to track) + +7. ΠŸΡ€ΠΎΡΠΌΠΎΡ‚Ρ€ истории. Π Π°Π±ΠΎΡ‚Π° с ΠΆΡƒΡ€Π½Π°Π»ΠΎΠΌ рСпозитария +ΠŸΠΎΠΏΡ€ΠΎΠ±ΠΎΠ²Π°Π» Ρ€Π°Π·Ρ€ΠΈΡ‡Π½Ρ‹Π΅ ΠΎΠΏΡ†ΠΈΠΈ ΠΊΠΎΠΌΠ°Π½Π΄Ρ‹ git log: +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Alice/project (main) +$ git log +commit 9c6c79e51cf10bc1b6346403a4c54d4236317221 (HEAD -> main) +Author: Alice (KhodyukMR) +Date: Mon Mar 18 15:51:35 2024 +0300 + + code: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Π²Ρ‹Π²ΠΎΠ΄ разности + +commit 8b42ef9a06a6c6bd040bac0808db58bcf9c549fa +Author: Alice (KhodyukMR) +Date: Mon Mar 18 15:49:09 2024 +0300 + + code: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Π²Ρ‹Π²ΠΎΠ΄ суммы + +commit 8c3620a216f261a93421cf8938546ca2b3aab5c4 +Author: Alice (KhodyukMR) +Date: Mon Mar 18 15:47:10 2024 +0300 + + code: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Π²Π²ΠΎΠ΄ чисСл + +commit 8656625b2f04f6d4995858dd96e9d289f6c16978 +Author: Alice (KhodyukMR) +Date: Mon Mar 18 15:39:57 2024 +0300 + + build: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Ρ„Π°ΠΉΠ» ΠΏΡ€ΠΎΠ΅ΠΊΡ‚Π° + +commit 7ba6699137817231ee5f7b3b39cb01456ce2589f +Author: Alice (KhodyukMR) +Date: Mon Mar 18 15:37:27 2024 +0300 + + code: Π·Π°Π³ΠΎΡ‚ΠΎΠ²ΠΊΠ° ΠΏΡ€ΠΎΠ³Ρ€Π°ΠΌΠΌΡ‹ + +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Alice/project (main) +$ git log --stat +commit 9c6c79e51cf10bc1b6346403a4c54d4236317221 (HEAD -> main) +commit 9c6c79e51cf10bc1b6346403a4c54d4236317221 (HEAD -> main) +Author: Alice (KhodyukMR) +Date: Mon Mar 18 15:51:35 2024 +0300 + + code: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Π²Ρ‹Π²ΠΎΠ΄ разности + + main.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 8b42ef9a06a6c6bd040bac0808db58bcf9c549fa +Author: Alice (KhodyukMR) +Date: Mon Mar 18 15:49:09 2024 +0300 + + code: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Π²Ρ‹Π²ΠΎΠ΄ суммы + + main.cpp | 1 + + 1 file changed, 1 insertion(+) + +commit 8c3620a216f261a93421cf8938546ca2b3aab5c4 +Author: Alice (KhodyukMR) +Date: Mon Mar 18 15:47:10 2024 +0300 + + code: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Π²Π²ΠΎΠ΄ чисСл + + main.cpp | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +commit 8656625b2f04f6d4995858dd96e9d289f6c16978 +Author: Alice (KhodyukMR) +Date: Mon Mar 18 15:39:57 2024 +0300 + + build: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Ρ„Π°ΠΉΠ» ΠΏΡ€ΠΎΠ΅ΠΊΡ‚Π° + + project.sln | 31 +++++++++++++++++++++++++++++++ + 1 file changed, 31 insertions(+) + +commit 7ba6699137817231ee5f7b3b39cb01456ce2589f +Author: Alice (KhodyukMR) +Date: Mon Mar 18 15:37:27 2024 +0300 + + code: Π·Π°Π³ΠΎΡ‚ΠΎΠ²ΠΊΠ° ΠΏΡ€ΠΎΠ³Ρ€Π°ΠΌΠΌΡ‹ + + main.cpp | 1 + + 1 file changed, 1 insertion(+) + +ΠΠ°ΡˆΡ‘Π» ΠΊΠΎΠΌΠΌΠΈΡ‚Ρ‹ ΠΏΠΎ Ρ‚Π΅ΠΌΠ΅ build, Π·Π°Ρ‚Π΅ΠΌ ΠΊΠΎΠΌΠΌΠΈΡ‚Ρ‹, Π·Π°Ρ‚Ρ€Π°Π³ΠΈΠ²Π°ΡŽΡ‰ΠΈΠ΅ project.sln: +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Alice/project (main) +$ git log --grep "build:" +commit 8656625b2f04f6d4995858dd96e9d289f6c16978 +Author: Alice (KhodyukMR) +Date: Mon Mar 18 15:39:57 2024 +0300 + + build: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Ρ„Π°ΠΉΠ» ΠΏΡ€ΠΎΠ΅ΠΊΡ‚Π° + +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Alice/project (main) +$ git log -- project.sln +commit 8656625b2f04f6d4995858dd96e9d289f6c16978 +Author: Alice (KhodyukMR) +Date: Mon Mar 18 15:39:57 2024 +0300 + + build: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Ρ„Π°ΠΉΠ» ΠΏΡ€ΠΎΠ΅ΠΊΡ‚Π° + +8. ΠŸΡ€ΠΎΡΠΌΠΎΡ‚Ρ€ ΠΊΠΎΠΌΠΌΠΈΡ‚ΠΎΠ² +ΠŸΠΎΡΠΌΠΎΡ‚Ρ€Π΅Π» прСдпослСдний ΠΊΠΎΠΌΠΌΠΈΡ‚: +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Alice/project (main) +$ git show HEAD~1 +commit 8b42ef9a06a6c6bd040bac0808db58bcf9c549fa +Author: Alice (KhodyukMR) +Date: Mon Mar 18 15:49:09 2024 +0300 + + code: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Π²Ρ‹Π²ΠΎΠ΄ суммы + +diff --git a/main.cpp b/main.cpp +index e446069..e1f60e0 100644 +--- a/main.cpp ++++ b/main.cpp +@@ -4,5 +4,6 @@ int main() { + cout << "Enter A and B: "; + int a, b; + cin >> a >> b; ++ cout << "A + B = " << a + b; + return 0; + } + +9. ΠŸΡ€ΠΎΡΠΌΠΎΡ‚Ρ€ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ +Π”ΠΎΠ±Π°Π²ΠΈΠΌ Π² Ρ„ΡƒΠ½ΠΊΡ†ΠΈΡŽ Π²Ρ‹Π²ΠΎΠ΄ произвСдСния, Π½ΠΎ ΠΏΠΎΠΊΠ° Ρ‡Ρ‚ΠΎ Π½Π΅ Π±ΡƒΠ΄Π΅ΠΌ ΠΊΠΎΠΌΠΌΠΈΡ‚ΠΈΡ‚ΡŒ, просмотрим измСнСния: +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Alice/project (main) +$ git diff +diff --git a/main.cpp b/main.cpp +index 4953c83..e330f35 100644 +--- a/main.cpp ++++ b/main.cpp +@@ -6,5 +6,6 @@ int main() { + cin >> a >> b; + cout << "A + B = " << a + b << endl; + cout << "A - B = " << a - b << endl; ++ cout << "A * B = " << a * b << endl; + return 0; + } + +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Alice/project (main) +$ git diff HEAD~2 +diff --git a/main.cpp b/main.cpp +index e446069..e330f35 100644 +--- a/main.cpp ++++ b/main.cpp +@@ -4,5 +4,8 @@ int main() { + cout << "Enter A and B: "; + int a, b; + cin >> a >> b; ++ cout << "A + B = " << a + b << endl; ++ cout << "A - B = " << a - b << endl; ++ cout << "A * B = " << a * b << endl; + return 0; + } + +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Alice/project (main) +$ git diff HEAD~2 HEAD +diff --git a/main.cpp b/main.cpp +index e446069..4953c83 100644 +--- a/main.cpp ++++ b/main.cpp +@@ -4,5 +4,7 @@ int main() { + cout << "Enter A and B: "; + int a, b; + cin >> a >> b; ++ cout << "A + B = " << a + b << endl; ++ cout << "A - B = " << a - b << endl; + return 0; + } + +ΠŸΡ€ΠΎΡΠΌΠΎΡ‚Ρ€ΠΈΠΌ Ρ€Π°Π·Π½ΠΈΡ†Ρƒ ΠΌΠ΅ΠΆΠ΄Ρƒ самым ΠΏΠ΅Ρ€Π²Ρ‹ΠΌ ΠΊΠΎΠΌΠΌΠΈΡ‚ΠΎΠ² ΠΈ Ρ‚Π΅ΠΌ, Ρ‡Ρ‚ΠΎ добавлял Π²Ρ‹Π²ΠΎΠ΄ Ρ€Π°Π·Π½ΠΈΡ†Ρ‹ чисСл: +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Alice/project (main) +$ git diff HEAD~3 Head +diff --git a/main.cpp b/main.cpp +index 5f28270..4953c83 100644 +--- a/main.cpp ++++ b/main.cpp +@@ -1 +1,10 @@ +-ο»Ώ +\ No newline at end of file ++ο»Ώ#include "iostream" ++using namespace std; ++int main() { ++ cout << "Enter A and B: "; ++ int a, b; ++ cin >> a >> b; ++ cout << "A + B = " << a + b << endl; ++ cout << "A - B = " << a - b << endl; ++ return 0; ++} + +10.ΠžΡ‚ΠΊΠ°Ρ‚ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ +БдСлаю ΠΊΠΎΠΌΠΌΠΈΡ‚ для Π²Ρ‹Π²ΠΎΠ΄Π° произвСдСния: +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Alice/project (main) +$ git add main.cpp + +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Alice/project (main) +$ git commit -m "code: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Π²Ρ‹Π²ΠΎΠ΄ произвСдСния" +[main dce6af7] code: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Π²Ρ‹Π²ΠΎΠ΄ произвСдСния + 1 file changed, 1 insertion(+) + +ΠžΡ‚ΠΊΠ°Ρ‡Ρƒ этот ΠΊΠΎΠΌΠΌΠΈΡ‚(Π²Π΅Ρ€Π½ΡƒΡΡŒ ΠΊ ΠΏΡ€Π΅Π΄Ρ‹Π΄ΡƒΡ‰Π΅ΠΌΡƒ): +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Alice/project (main) +$ git reset --hard HEAD~1 +HEAD is now at 9c6c79e code: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Π²Ρ‹Π²ΠΎΠ΄ разности + +Π”ΠΎΠ±Π°Π²Π»ΡŽ Π² main.cpp ΠΊΠΎΠΌΠΌΠ΅Π½Ρ‚Π°Ρ€ΠΈΠΉ, послС Ρ‡Π΅Π³ΠΎ ΠΎΡ‚ΠΌΠ΅Π½ΡŽ Π΅Π³ΠΎ, Π²Π΅Ρ€Π½ΡƒΠ²ΡˆΠΈΡΡŒ ΠΊ послСднСму ΠΊΠΎΠΌΠΌΠΈΡ‚Ρƒ: +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Alice/project (main) +$ git checkout HEAD -- main.cpp + +11. ОбмСн ΠΊΠΎΠ΄ΠΎΠΌ Ρ‡Π΅Ρ€Π΅Π· ΡƒΠ΄Π°Π»Ρ‘Π½Π½ΠΎΠ΅ Ρ…Ρ€Π°Π½ΠΈΠ»ΠΈΡ‰Π΅: +ЗарСгистрировался Π½Π° сайтС Git УИВ, ΠΈ Ρ‚Π°ΠΊ ΠΊΠ°ΠΊ Π΄Π΅Π»Π°Π» Π½Π΅ Π² Π»Π°Π±ΠΎΡ€Π°Ρ‚ΠΎΡ€ΠΈΠΈ, добавлял ΠΏΡ€ΠΎΠ΅ΠΊΡ‚ Π½Π° сайт Ρ‡Π΅Ρ€Π΅Π· HTTP + +12. ΠŸΠΎΠ»ΡƒΡ‡Π΅Π½ΠΈΠ΅ ΠΏΡ€ΠΎΠ΅ΠΊΡ‚Π° с сСрвСра +ΠšΠ»ΠΎΠ½ΠΈΡ€ΠΎΠ²Π°Π» ΠΏΡ€ΠΎΠ΅ΠΊΡ‚ Π² ΠΏΠ°ΠΏΠΊΡƒ Bob: +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Bob +$ git clone http://uit.mpei.ru/git/KhodiukMR/cs-lab02.git project +Cloning into 'project'... +remote: Enumerating objects: 15, done. +remote: Counting objects: 100% (15/15), done. +remote: Compressing objects: 100% (13/13), done. +remote: Total 15 (delta 2), reused 0 (delta 0), pack-reused 0 +Receiving objects: 100% (15/15), done. +Resolving deltas: 100% (2/2), done. + +ΠŸΠ΅Ρ€Π΅ΡˆΡ‘Π» Π² ΠΊΠ°Ρ‚Π°Π»ΠΎΠ³ ΠΏΡ€ΠΎΠ΅ΠΊΡ‚Π° Π½Π° "машинС Π‘ΠΎΠ±Π°" ΠΈ настроил Git, Π΄ΠΎΠ±Π°Π²ΠΈΠ² ΠΈΠ½ΠΈΡ†ΠΈΠ°Π»Ρ‹ ΠΈ email: +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Bob +$ cd project + +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Bob/project (main) +$ git config user.name 'Bob (KhodiukMR)' + +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Bob/project (main) +$ git config user.email 'KhodiukMR@mpei.ru' + +13. БовмСстная Ρ€Π°Π±ΠΎΡ‚Π° Π½Π°Π΄ ΠΏΡ€ΠΎΠ΅ΠΊΡ‚ΠΎΠΌ Π±Π΅Π· ΠΊΠΎΠ½Ρ„Π»ΠΈΠΊΡ‚ΠΎΠ² ΠΏΡ€Π°Π²ΠΎΠΊ +Π”ΠΎΠ±Π°Π²ΠΈΠ» Π² ΠΏΡ€ΠΎΠ³Ρ€Π°ΠΌΠΌΡƒ Π½Π° "машинС Π‘ΠΎΠ±Π°" ΠΏΡ€ΠΎΠΈΠ·Π²Π΅Π΄Π΅Π½ΠΈΠ΅ чисСл ΠΈ сдСлал ΠΊΠΎΠΌΠΌΠΈΡ‚, послС Ρ‡Π΅Π³ΠΎ ΠΎΡ‚ΠΏΡ€Π°Π²ΠΈΠ» Π΅Π³ΠΎ Π½Π° сСрвСр: +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Bob/project (main) +$ git add main.cpp + +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Bob/project (main) +$ git commit -m 'code: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Π²Ρ‹Π²ΠΎΠ΄ произвСдСния' +[main cc25459] code: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Π²Ρ‹Π²ΠΎΠ΄ произвСдСния + 1 file changed, 1 insertion(+) + +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Bob/project (main) +$ git push +Enumerating objects: 5, done. +Counting objects: 100% (5/5), done. +Delta compression using up to 12 threads +Compressing objects: 100% (3/3), done. +Writing objects: 100% (3/3), 384 bytes | 384.00 KiB/s, done. +Total 3 (delta 1), reused 0 (delta 0), pack-reused 0 (from 0) +remote: . Processing 1 references +remote: Processed 1 references in total +To http://uit.mpei.ru/git/KhodiukMR/cs-lab02.git + 9c6c79e..cc25459 main -> main + +"На машинС Алисы" Π²Ρ‹ΠΏΠΎΠ»Π½ΠΈΠ» Π·Π°Π³Ρ€ΡƒΠ·ΠΊΡƒ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ с сСрвСра, просмотрСл ΠΈΡΡ‚ΠΎΡ€ΠΈΡŽ всСх Π²Π΅Ρ‚ΠΎΠΊ ΠΈ ΠΏΡ€ΠΎΠ΄Π²ΠΈΠ½ΡƒΠ» main ΠΊ скачанной вСрсии: +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Alice/project (main) +$ git fetch +remote: Enumerating objects: 5, done. +remote: Counting objects: 100% (5/5), done. +remote: Compressing objects: 100% (3/3), done. +remote: Total 3 (delta 1), reused 0 (delta 0), pack-reused 0 +Unpacking objects: 100% (3/3), 364 bytes | 121.00 KiB/s, done. +From http://uit.mpei.ru/git/KhodiukMR/cs-lab02 + 9c6c79e..cc25459 main -> origin/main + +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Alice/project (main) +$ git log --oneline --decorate --all --graph +* cc25459 (origin/main) code: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Π²Ρ‹Π²ΠΎΠ΄ произвСдСния +* 9c6c79e (HEAD -> main) code: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Π²Ρ‹Π²ΠΎΠ΄ разности +* 8b42ef9 code: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Π²Ρ‹Π²ΠΎΠ΄ суммы +* 8c3620a code: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Π²Π²ΠΎΠ΄ чисСл +* 8656625 build: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Ρ„Π°ΠΉΠ» ΠΏΡ€ΠΎΠ΅ΠΊΡ‚Π° +* 7ba6699 code: Π·Π°Π³ΠΎΡ‚ΠΎΠ²ΠΊΠ° ΠΏΡ€ΠΎΠ³Ρ€Π°ΠΌΠΌΡ‹ + +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Alice/project (main) +$ git pull --ff-only +Updating 9c6c79e..cc25459 +Fast-forward + main.cpp | 1 + + 1 file changed, 1 insertion(+) + +"На машинС Алисы" Π΄ΠΎΠ±Π°Π²ΠΈΠ» ΠΏΠ΅Ρ‡Π°Ρ‚ΡŒ частного, сдСлал ΠΊΠΎΠΌΠΌΠΈΡ‚ΠΈΠ» ΠΈ ΠΏΡ€ΠΎΠ΄Π²ΠΈΠ½ΡƒΠ» main "Π½Π° машинС Π‘ΠΎΠ±Π°" Π΄ΠΎ вСрсии "Π½Π° машинС Алисы": +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Alice/project (main) +$ git add main.cpp + +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Alice/project (main) +$ git commit -m 'code: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Π²Ρ‹Π²ΠΎΠ΄ частного' +[main 72aa1e9] code: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Π²Ρ‹Π²ΠΎΠ΄ частного + 1 file changed, 1 insertion(+) + +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Alice/project (main) +$ git push +Enumerating objects: 5, done. +Counting objects: 100% (5/5), done. +Delta compression using up to 12 threads +Compressing objects: 100% (3/3), done. +Writing objects: 100% (3/3), 398 bytes | 398.00 KiB/s, done. +Total 3 (delta 1), reused 0 (delta 0), pack-reused 0 (from 0) +remote: . Processing 1 references +remote: Processed 1 references in total +To http://uit.mpei.ru/git/KhodiukMR/cs-lab02.git + cc25459..72aa1e9 main -> main + +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Alice/project (main) +$ cd .. + +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Alice +$ cd .. + +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02 +$ cd Bob + +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Bob +$ cd project + +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Bob/project (main) +$ git fetch +remote: Enumerating objects: 5, done. +remote: Counting objects: 100% (5/5), done. +remote: Compressing objects: 100% (3/3), done. +remote: Total 3 (delta 1), reused 0 (delta 0), pack-reused 0 +Unpacking objects: 100% (3/3), 378 bytes | 47.00 KiB/s, done. +From http://uit.mpei.ru/git/KhodiukMR/cs-lab02 + cc25459..72aa1e9 main -> origin/main + +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Bob/project (main) +$ git pull --ff-only +Updating cc25459..72aa1e9 +Fast-forward + main.cpp | 1 + + 1 file changed, 1 insertion(+) + +14. Π Π°Π·Ρ€Π΅ΡˆΠ΅Π½ΠΈΠ΅ ΠΊΠΎΠ½Ρ„Π»ΠΈΠΊΡ‚ΠΎΠ² ΠΏΡ€Π°Π²ΠΎΠΊ ΠΏΡ€ΠΈ совмСстной Ρ€Π°Π±ΠΎΡ‚Π΅ +«На машинС Алисы» Π΄ΠΎΠΏΠΎΠ»Π½ΠΈΠ» ΠΏΡ€ΠΎΠ³Ρ€Π°ΠΌΠΌΡƒ ΠΏΠ΅Ρ‡Π°Ρ‚ΡŒΡŽ максимума, сдСлал ΠΊΠΎΠΌΠΌΠΈΡ‚ ΠΈ ΠΎΡ‚ΠΏΡ€Π°Π²ΠΈΠ» Π΅Π³ΠΎ Π½Π° сСрвСр. +«На машинС Π‘ΠΎΠ±Π°Β» Π΄ΠΎΠΏΠΎΠ»Π½ΠΈΠ» ΠΏΡ€ΠΎΠ³Ρ€Π°ΠΌΠΌΡƒ ΠΏΠ΅Ρ‡Π°Ρ‚ΡŒΡŽ ΠΌΠΈΠ½ΠΈΠΌΡƒΠΌΠ°, сдСлайл ΠΊΠΎΠΌΠΌΠΈΡ‚ ΠΈ попытался ΠΎΡ‚ΠΏΡ€Π°Π²ΠΈΡ‚ΡŒ Π΅Π³ΠΎ Π½Π° сСрвСр. +Как ΠΌΠΎΠΆΠ½ΠΎ Π²ΠΈΠ΄Π΅Ρ‚ΡŒ, ΡƒΠ΄Π°Π»Π΅Π½Π½Ρ‹ΠΉ Ρ€Π΅ΠΏΠΎΠ·ΠΈΡ‚Π°Ρ€ΠΈΠΉ Π½Π΅ ΠΏΡ€ΠΈΠ½ΠΈΠΌΠ°Π΅Ρ‚ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ: +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Alice/project (main) +$ git add main.cpp + +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Alice/project (main) +$ git commit -m "code: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Π²Ρ‹Π²ΠΎΠ΄ максимума" +[main eaac8cc] code: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Π²Ρ‹Π²ΠΎΠ΄ максимума + 1 file changed, 6 insertions(+) + +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Alice/project (main) +$ git push +Enumerating objects: 5, done. +Counting objects: 100% (5/5), done. +Delta compression using up to 12 threads +Compressing objects: 100% (3/3), done. +Writing objects: 100% (3/3), 428 bytes | 428.00 KiB/s, done. +Total 3 (delta 1), reused 0 (delta 0), pack-reused 0 (from 0) +remote: . Processing 1 references +remote: Processed 1 references in total +To http://uit.mpei.ru/git/KhodiukMR/cs-lab02.git + 72aa1e9..eaac8cc main -> main + +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Bob/project (main) +$ git add main.cpp + +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Bob/project (main) +$ git commit -m 'code: Π”ΠΎΠ±Π°Π²Π»Π΅Π½ Π²Ρ‹Π²ΠΎΠ΄ ΠΌΠΈΠ½ΠΈΠΌΡƒΠΌΠ°' +[main 4c7c51f] code: Π”ΠΎΠ±Π°Π²Π»Π΅Π½ Π²Ρ‹Π²ΠΎΠ΄ ΠΌΠΈΠ½ΠΈΠΌΡƒΠΌΠ° + 1 file changed, 6 insertions(+) + +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Bob/project (main) +$ git push +To http://uit.mpei.ru/git/KhodiukMR/cs-lab02.git + ! [rejected] main -> main (fetch first) +error: failed to push some refs to 'http://uit.mpei.ru/git/KhodiukMR/cs-lab02.git' +hint: Updates were rejected because the remote contains work that you do not +hint: have locally. This is usually caused by another repository pushing to +hint: the same ref. If you want to integrate the remote changes, use +hint: 'git pull' before pushing again. +hint: See the 'Note about fast-forwards' in 'git push --help' for details. + +"ΠžΡ‚ Π»ΠΈΡ†Π° Π‘ΠΎΠ±Π°" Π·Π°Π³Ρ€ΡƒΠ·ΠΈΠ» Ρ„Π°ΠΉΠ»Ρ‹ ΠΈΠ· ΡƒΠ΄Π°Π»Ρ‘Π½Π½ΠΎΠ³ΠΎ Ρ…Ρ€Π°Π½ΠΈΠ»ΠΈΡ‰Π° ΠΈ ΠΏΡ€ΠΎΠ²Π΅Ρ€ΠΈΠ» ΠΈΡΡ‚ΠΎΡ€ΠΈΡŽ Π²Π΅Ρ‚ΠΎΠΊ: +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Bob/project (main) +$ git fetch +remote: Enumerating objects: 5, done. +remote: Counting objects: 100% (5/5), done. +remote: Compressing objects: 100% (3/3), done. +remote: Total 3 (delta 1), reused 0 (delta 0), pack-reused 0 +Unpacking objects: 100% (3/3), 408 bytes | 51.00 KiB/s, done. +From http://uit.mpei.ru/git/KhodiukMR/cs-lab02 +[detached HEAD 04e1d6f] code: Π”ΠΎΠ±Π°Π²Π»Π΅Π½ Π²Ρ‹Π²ΠΎΠ΄ ΠΌΠΈΠ½ΠΈΠΌΡƒΠΌΠ° + 1 file changed, 6 insertions(+) +Successfully rebased and updated refs/heads/main. + +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Bob/project (main) +$ git log --oneline --decorate --all --graph +* 04e1d6f (HEAD -> main) code: Π”ΠΎΠ±Π°Π²Π»Π΅Π½ Π²Ρ‹Π²ΠΎΠ΄ ΠΌΠΈΠ½ΠΈΠΌΡƒΠΌΠ° +* eaac8cc (origin/main, origin/HEAD) code: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Π²Ρ‹Π²ΠΎΠ΄ максимума +* 72aa1e9 code: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Π²Ρ‹Π²ΠΎΠ΄ частного +* cc25459 code: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Π²Ρ‹Π²ΠΎΠ΄ произвСдСния +* 9c6c79e code: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Π²Ρ‹Π²ΠΎΠ΄ разности +* 8b42ef9 code: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Π²Ρ‹Π²ΠΎΠ΄ суммы +* 8c3620a code: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Π²Π²ΠΎΠ΄ чисСл +* 8656625 build: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Ρ„Π°ΠΉΠ» ΠΏΡ€ΠΎΠ΅ΠΊΡ‚Π° +* 7ba6699 code: Π·Π°Π³ΠΎΡ‚ΠΎΠ²ΠΊΠ° ΠΏΡ€ΠΎΠ³Ρ€Π°ΠΌΠΌΡ‹ + +ΠŸΡ€ΠΎΠ±ΡƒΡŽ ΠΏΠ΅Ρ€Π΅ΠΌΠ΅ΡΡ‚ΠΈΡ‚ΡŒ ΠΊΠΎΠΌΠΌΠΈΡ‚ Π‘ΠΎΠ±Π° ΠΏΠΎΠ²Π΅Ρ€Ρ… ΠΊΠΎΠΌΠΌΠΈΡ‚Π° Алисы, Π²Ρ‹Π΄Π°Ρ‘Ρ‚ ΠΎΡˆΠΈΠ±ΠΊΡƒ: +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Bob/project (main) +$ git rebase origin/main +Auto-merging main.cpp +CONFLICT (content): Merge conflict in main.cpp +error: could not apply e312366... code: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ΠΈΠ΅ Π²Ρ‹Π²ΠΎΠ΄Π° минимального значСния +hint: Resolve all conflicts manually, mark them as resolved with +hint: "git add/rm ", then run "git rebase --continue". +hint: You can instead skip this commit: run "git rebase --skip". +hint: To abort and get back to the state before "git rebase", run "git rebase --abort". +Could not apply e312366... code: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ΠΈΠ΅ Π²Ρ‹Π²ΠΎΠ΄Π° минимального значСния + +"На машинС Π‘ΠΎΠ±Π°" Π²Ρ€ΡƒΡ‡Π½ΡƒΡŽ ΠΎΡ‚Ρ€Π΅Π΄Π°ΠΊΡ‚ΠΈΡ€ΠΎΠ²Π°Π» ΠΊΠΎΠ΄ Ρ‚Π°ΠΊ, Ρ‡Ρ‚ΠΎΠ±Ρ‹ ΠΎΠ½ Π²ΠΊΠ»ΡŽΡ‡Π°Π» ΠΈ ΠΏΡ€Π°Π²ΠΊΠΈ Алисы, ΠΈ ΠΏΡ€Π°Π²ΠΊΠΈ Π‘ΠΎΠ±Π° +ПослС Ρ‚ΠΎΠ³ΠΎ, ΠΊΠ°ΠΊ ΠΊΠΎΠ½Ρ„Π»ΠΈΠΊΡ‚ Ρ€Π°Π·Ρ€Π΅ΡˆΡ‘Π½, добавляю Ρ„Π°ΠΉΠ» Π² индСкс ΠΈ ΠΏΡ€ΠΎΠ΄ΠΎΠ»ΠΆΠ°ΡŽ ΠΎΠΏΠ΅Ρ€Π°Ρ†ΠΈΡŽ rebase: +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Bob/project (main) +$ git add main.cpp + +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Bob/project (main) +$ git rebase --continue +Successfully rebased and updated refs/heads/main. + +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Bob/project (main) +$ git log --oneline --decorate --all --graph +* 04e1d6f (HEAD -> main, origin/main, origin/HEAD) code: Π”ΠΎΠ±Π°Π²Π»Π΅Π½ Π²Ρ‹Π²ΠΎΠ΄ ΠΌΠΈΠ½ΠΈΠΌΡƒΠΌΠ° +* eaac8cc code: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Π²Ρ‹Π²ΠΎΠ΄ максимума +* 72aa1e9 code: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Π²Ρ‹Π²ΠΎΠ΄ частного +* cc25459 code: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Π²Ρ‹Π²ΠΎΠ΄ произвСдСния +* 9c6c79e code: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Π²Ρ‹Π²ΠΎΠ΄ разности +* 8b42ef9 code: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Π²Ρ‹Π²ΠΎΠ΄ суммы +* 8c3620a code: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Π²Π²ΠΎΠ΄ чисСл +* 8656625 build: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Ρ„Π°ΠΉΠ» ΠΏΡ€ΠΎΠ΅ΠΊΡ‚Π° +* 7ba6699 code: Π·Π°Π³ΠΎΡ‚ΠΎΠ²ΠΊΠ° ΠΏΡ€ΠΎΠ³Ρ€Π°ΠΌΠΌΡ‹ + +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Bob/project (main) +$ git push +Enumerating objects: 5, done. +Counting objects: 100% (5/5), done. +Delta compression using up to 12 threads +Compressing objects: 100% (3/3), done. +Writing objects: 100% (3/3), 394 bytes | 394.00 KiB/s, done. +Total 3 (delta 1), reused 0 (delta 0), pack-reused 0 (from 0) +remote: . Processing 1 references +remote: Processed 1 references in total +To http://uit.mpei.ru/git/KhodiukMR/cs-lab02.git + eaac8cc..04e1d6f main -> main + +15. ИспользованиС Π²Π΅Ρ‚ΠΎΠΊ +Боздаю Π²Π΅Ρ‚ΠΊΡƒ double ΠΈ ΠΏΠ΅Ρ€Π΅ΠΊΠ»ΡŽΡ‡Π°ΡŽΡΡŒ Π½Π° Π½Π΅Ρ‘: +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Alice/project (main) +$ git branch double + +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Alice/project (main) +$ git checkout double +Switched to branch 'double' + +Π—Π°ΠΌΠ΅Π½ΠΈΠ» Ρ‚ΠΈΠΏ ΠΏΠ΅Ρ€Π΅ΠΌΠ΅Π½Π½Ρ‹Ρ… Π² ΠΏΡ€ΠΎΠ³Ρ€Π°ΠΌΠΌΠ΅ Π½Π° double ΠΈ сдСлал ΠΊΠΎΠΌΠΌΠΈΡ‚: +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Alice/project (double) +$ git add main.cpp + +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Alice/project (double) +$ git commit -m "code: ΠΈΠ·ΠΌΠ΅Π½Ρ‘Π½ Ρ‚ΠΈΠΏ Π΄Π°Π½Π½Ρ‹Ρ… с int Π½Π° double +> " +[double ff1cdfd] code: ΠΈΠ·ΠΌΠ΅Π½Ρ‘Π½ Ρ‚ΠΈΠΏ Π΄Π°Π½Π½Ρ‹Ρ… с int Π½Π° double + 1 file changed, 1 insertion(+), 1 deletion(-) + +ΠŸΠ΅Ρ€Π΅ΠΊΠ»ΡŽΡ‡Π°ΡŽΡΡŒ Π½Π° Π²Π΅Ρ‚ΠΊΡƒ main, ΡΠΈΠ½Ρ…Ρ€ΠΎΠ½ΠΈΠ·ΠΈΡ€ΡƒΡŽ эту Π²Π΅Ρ‚ΠΊΡƒ Alice с сСрвСром ΠΈ сливаю Π²Π΅Ρ‚ΠΊΡƒ double с main: +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Alice/project (double) +$ git checkout main +Switched to branch 'main' +Your branch is up to date with 'origin/main'. + +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Alice/project (main) +$ git fetch +remote: Enumerating objects: 5, done. +remote: Counting objects: 100% (5/5), done. +remote: Compressing objects: 100% (3/3), done. +remote: Total 3 (delta 1), reused 0 (delta 0), pack-reused 0 +Unpacking objects: 100% (3/3), 374 bytes | 37.00 KiB/s, done. +From http://uit.mpei.ru/git/KhodiukMR/cs-lab02 + eaac8cc..04e1d6f main -> origin/main + +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Alice/project (main) +$ git pull --ff-only +Updating eaac8cc..04e1d6f +Fast-forward + main.cpp | 6 ++++++ + 1 file changed, 6 insertions(+) + +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Alice/project (main) +$ git log --oneline --decorate --all --graph +* ff1cdfd (double) code: ΠΈΠ·ΠΌΠ΅Π½Ρ‘Π½ Ρ‚ΠΈΠΏ Π΄Π°Π½Π½Ρ‹Ρ… с int Π½Π° double +| * 04e1d6f (HEAD -> main, origin/main) code: Π”ΠΎΠ±Π°Π²Π»Π΅Π½ Π²Ρ‹Π²ΠΎΠ΄ ΠΌΠΈΠ½ΠΈΠΌΡƒΠΌΠ° +|/ +* eaac8cc code: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Π²Ρ‹Π²ΠΎΠ΄ максимума +* 72aa1e9 code: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Π²Ρ‹Π²ΠΎΠ΄ частного +* cc25459 code: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Π²Ρ‹Π²ΠΎΠ΄ произвСдСния +* 9c6c79e code: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Π²Ρ‹Π²ΠΎΠ΄ разности +* 8b42ef9 code: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Π²Ρ‹Π²ΠΎΠ΄ суммы +* 8c3620a code: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Π²Π²ΠΎΠ΄ чисСл +* 8656625 build: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Ρ„Π°ΠΉΠ» ΠΏΡ€ΠΎΠ΅ΠΊΡ‚Π° +* 7ba6699 code: Π·Π°Π³ΠΎΡ‚ΠΎΠ²ΠΊΠ° ΠΏΡ€ΠΎΠ³Ρ€Π°ΠΌΠΌΡ‹ + +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Alice/project (main) +$ git merge double +Auto-merging main.cpp +Merge made by the 'ort' strategy. + main.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Alice/project (main) +$ git push +Enumerating objects: 10, done. +Counting objects: 100% (10/10), done. +Delta compression using up to 12 threads +Compressing objects: 100% (6/6), done. +Writing objects: 100% (6/6), 680 bytes | 680.00 KiB/s, done. +Total 6 (delta 2), reused 0 (delta 0), pack-reused 0 (from 0) +remote: . Processing 1 references +remote: Processed 1 references in total +To http://uit.mpei.ru/git/KhodiukMR/cs-lab02.git + 04e1d6f..6e130ae main -> main + + +MAKSIMKA@DESKTOP-MSC30JC MINGW64 ~/Desktop/lab02/Alice/project (main) +$ git log --oneline --decorate --all --graph +* 6e130ae (HEAD -> main) Merge branch 'double' +|\ +| * ff1cdfd (double) code: ΠΈΠ·ΠΌΠ΅Π½Ρ‘Π½ Ρ‚ΠΈΠΏ Π΄Π°Π½Π½Ρ‹Ρ… с int Π½Π° double +* | 04e1d6f (origin/main) code: Π”ΠΎΠ±Π°Π²Π»Π΅Π½ Π²Ρ‹Π²ΠΎΠ΄ ΠΌΠΈΠ½ΠΈΠΌΡƒΠΌΠ° +|/ +* eaac8cc code: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Π²Ρ‹Π²ΠΎΠ΄ максимума +* 72aa1e9 code: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Π²Ρ‹Π²ΠΎΠ΄ частного +* cc25459 code: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Π²Ρ‹Π²ΠΎΠ΄ произвСдСния +* 9c6c79e code: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Π²Ρ‹Π²ΠΎΠ΄ разности +* 8b42ef9 code: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Π²Ρ‹Π²ΠΎΠ΄ суммы +* 8c3620a code: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Π²Π²ΠΎΠ΄ чисСл +* 8656625 build: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Ρ„Π°ΠΉΠ» ΠΏΡ€ΠΎΠ΅ΠΊΡ‚Π° +* 7ba6699 code: Π·Π°Π³ΠΎΡ‚ΠΎΠ²ΠΊΠ° ΠΏΡ€ΠΎΠ³Ρ€Π°ΠΌΠΌΡ‹ \ No newline at end of file