From 41d665c9700b274fb4543a466580f856315322f2 Mon Sep 17 00:00:00 2001
From: OvsiannikovRS <ovsiannikovrs@mpei.ru>
Date: Mon, 7 Apr 2025 13:02:30 +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 | 907 ++++++++++++++++++
 1 file changed, 907 insertions(+)
 create mode 100644 ΠžΡ‚Ρ‡Π΅Ρ‚ ΠΏΠΎ Π»Π°Π±ΠΎΡ€Π°Ρ‚ΠΎΡ€Π½ΠΎΠΉ Ρ€Π°Π±ΠΎΡ‚Π΅ β„– 2.txt

diff --git a/ΠžΡ‚Ρ‡Π΅Ρ‚ ΠΏΠΎ Π»Π°Π±ΠΎΡ€Π°Ρ‚ΠΎΡ€Π½ΠΎΠΉ Ρ€Π°Π±ΠΎΡ‚Π΅ β„– 2.txt b/ΠžΡ‚Ρ‡Π΅Ρ‚ ΠΏΠΎ Π»Π°Π±ΠΎΡ€Π°Ρ‚ΠΎΡ€Π½ΠΎΠΉ Ρ€Π°Π±ΠΎΡ‚Π΅ β„– 2.txt
new file mode 100644
index 0000000..9f150fc
--- /dev/null
+++ b/ΠžΡ‚Ρ‡Π΅Ρ‚ ΠΏΠΎ Π»Π°Π±ΠΎΡ€Π°Ρ‚ΠΎΡ€Π½ΠΎΠΉ Ρ€Π°Π±ΠΎΡ‚Π΅ β„– 2.txt	
@@ -0,0 +1,907 @@
+ΠžΡ‚Ρ‡Π΅Ρ‚ ΠΏΠΎ Π»Π°Π±ΠΎΡ€Π°Ρ‚ΠΎΡ€Π½ΠΎΠΉ Ρ€Π°Π±ΠΎΡ‚Π΅ β„– 2 "БистСма контроля вСрсий Git"
+
+Π’Ρ‹ΠΏΠΎΠ»Π½ΠΈΠ»: Овсянников Π . Π‘.
+Π“Ρ€ΡƒΠΏΠΏΠ°:   А-01-24
+ΠŸΡ€ΠΎΠ²Π΅Ρ€ΠΈΠ»: 
+
+ΠŸΡ€ΠΈΠΌΠ΅Ρ‡Π°Π½ΠΈΠ΅: Ρ€Π°Π±ΠΎΡ‚Π° Π²Ρ‹ΠΏΠΎΠ»Π½ΡΠ»Π°ΡΡŒ Π½Π° Windows.
+
+1. Π‘ΠΎΠ·Π΄Π°Π» Π½Π° Ρ€Π°Π±ΠΎΡ‡Π΅ΠΌ столС ΠΊΠ°Ρ‚Π°Π»ΠΎΠ³ lab02 ΠΈ запустил Π² Π½Π΅ΠΌ Git Bash, ΠΏΡ€ΠΈΠ³Π»Π°ΡˆΠ΅Π½ΠΈΠ΅:
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02
+$
+
+
+
+2. CΠΎΠ·Π΄Π°Π» ΠΊΠ°Ρ‚Π°Π»ΠΎΠ³ΠΈ Алисы ΠΈ Π‘ΠΎΠ±Π°, ΠΈΠ·ΡƒΡ‡ΠΈΠ» ΠΊΠΎΠΌΠ°Π½Π΄Ρƒ cd.
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02
+$ mkdir alice
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02
+$ mkdir bob
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02
+$ cd alice
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice
+$ mkdir project
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice
+$ cd project
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project
+$ cd ..
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice
+$ cd project
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project
+$
+
+
+
+
+3. Π˜Π½ΠΈΡ†ΠΈΠ°Π»ΠΈΠ·ΠΈΡ€ΠΎΠ²Π°Π» Ρ€Π΅ΠΏΠΎΠ·ΠΈΡ‚Π°Ρ€ΠΈΠΉ.
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project
+$ git init
+Initialized empty Git repository in C:/Users/daemo/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project/.git/
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (master)
+$
+
+
+
+
+4. Настроил Ρ€Π΅ΠΏΠΎΠ·ΠΈΡ‚Π°Ρ€ΠΈΠΉ Алисы.
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (master)
+$ git config user.name 'Alice (OvsiannikovRS)'
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (master)
+$ git config user.email 'OvsiannikovRS@mpei.ru'
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (master)
+$
+
+
+
+
+5. Π‘ΠΎΠ·Π΄Π°Π» ΠΏΡ€ΠΎΠ΅ΠΊΡ‚ Π² Ρ€Π΅ΠΏΠΎΠ·ΠΈΡ‚Π°Ρ€ΠΈΠΈ Алисы, просмотрСл состояниС рСпозитария.
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (master)
+$ git status
+On branch master
+
+No commits yet (Π•Ρ‰Π΅ Π½Π΅Ρ‚ ΠΊΠΎΠΌΠΌΠΈΡ‚ΠΎΠ²)
+
+Untracked files: (НСотслСТиваСмыС Ρ„Π°ΠΉΠ»Ρ‹)
+  (use "git add <file>..." to include in what will be committed)
+        bin/
+        main.cpp
+        obj/
+        project.cbp
+
+nothing added to commit but untracked files present (use "git add" to track)
+(НичСго Π½Π΅ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½Π½ΠΎ Π² ΠΊΠΎΠΌΠΌΠΈΡ‚ Π½ΠΎ Π΅ΡΡ‚ΡŒ нСотслСТиваСмыС Ρ„Π°ΠΉΠ»Ρ‹)
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (master)
+$
+
+
+
+6. Π”ΠΎΠ±Π°Π²ΠΈΠ» Ρ„Π°ΠΉΠ» main.cpp Π² индСкс ΠΈ ΠΏΡ€ΠΎΠ²Π΅Ρ€Π» состояниС рСпозитария.
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (master)
+$ git add main.cpp
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (master)
+$ git status
+On branch master
+
+No commits yet
+
+Changes to be committed:
+  (use "git rm --cached <file>..." to unstage)
+        new file:   main.cpp
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+        bin/
+        obj/
+        project.cbp
+(Π³ΠΈΡ‚ ΡƒΠ²ΠΈΠ΄Π΅Π» Π½ΠΎΠ²Ρ‹ΠΉ Ρ„Π°ΠΉΠ» main.cpp)
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (master)
+$
+
+
+
+7. Π—Π°ΠΊΠΎΠΌΠΌΠΈΡ‚ΠΈΠ» ΠΊΠΎΠ΄ ΠΈ ΠΏΠ΅Ρ€Π΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Π» Π²Π΅Ρ‚ΠΊΡƒ Π² main.
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (master)
+$ git commit -m 'code: Π·Π°Π³ΠΎΡ‚ΠΎΠ²ΠΊΠ° ΠΏΡ€ΠΎΠ³Ρ€Π°ΠΌΠΌΡ‹'
+[master (root-commit) 90e7c97] code: Π·Π°Π³ΠΎΡ‚ΠΎΠ²ΠΊΠ° ΠΏΡ€ΠΎΠ³Ρ€Π°ΠΌΠΌΡ‹
+ 1 file changed, 9 insertions(+)
+ create mode 100644 main.cpp
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (master)
+$ git branch -m main
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main)
+$
+
+
+
+8. Π”ΠΎΠ±Π°Π²ΠΈΠ» Ρ„Π°ΠΉΠ» project.cbp Π² индСкс ΠΈ сдСлал ΠΊΠΎΠΌΠΈΡ‚ с Π½ΠΈΠΌ.
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main)
+$ git add project.cbp
+warning: in the working copy of 'project.cbp', LF will be replaced by CRLF the next time Git touches it
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main)
+$ git commit -m 'build: add project file'
+[main 5319550] build: add project file
+ 1 file changed, 40 insertions(+)
+ create mode 100644 project.cbp
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main)
+$
+
+
+
+9. ИзмСнил Ρ„Π°ΠΉΠ» main.cpp, ΠΏΡ€ΠΎΠ²Π΅Ρ€ΠΈΠ» статус рСпозитария.
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main)
+$ git status
+On branch main
+Changes not staged for commit:
+  (use "git add <file>..." to update what will be committed)
+  (use "git restore <file>..." to discard changes in working directory)
+        modified:   main.cpp (ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ Ρ„Π°ΠΉΠ» main.cpp)
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+        bin/
+        obj/
+
+no changes added to commit (use "git add" and/or "git commit -a")
+(Π½ΠΈΠΊΠ°ΠΊΠΈΠ΅ измСнСния Π½Π΅ Π΄ΠΎΠ±Π°Π²Π»Π΅Π½Ρ‹ Π² ΠΊΠΎΠΌΠΌΠΈΡ‚)
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main)
+$
+
+
+
+10. Π”ΠΎΠ±Π°Π²ΠΈΠ» Π² Π²Ρ‹Π²ΠΎΠ΄ разности ΠΈ суммы чисСл А ΠΈ Π’, сдСлал ΠΊΠΎΠΌΠΌΠΈΡ‚ с ΠΈΠ·ΠΌΠ΅Π½Π΅Π½Π½Ρ‹ΠΌ Ρ„Π°ΠΉΠ»ΠΎΠΌ.
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main)
+$ add main.cpp
+bash: add: command not found
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main)
+$ git add main.cpp
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main)
+$ git commit -m 'code: add sum A&B'
+[main 25f963d] code: add sum A&B
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main)
+$ git commit -a -m 'code: add difference A&B'
+[main 2fdb42d] code: add difference A&B
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main)
+$
+
+
+
+11. Π‘ΠΎΠ·Π΄Π°Π» Ρ„Π°ΠΉΠ» .gitigniore ΠΈ сдСлал с Π½ΠΈΠΌ ΠΊΠΎΠΌΠΌΠΈΡ‚.
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main)
+$ git status
+On branch main
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+        .gitignore
+        obj/
+        project.depend
+
+nothing added to commit but untracked files present (use "git add" to track)
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main)
+$ git status
+On branch main
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+        .gitignore
+        project.depend
+
+nothing added to commit but untracked files present (use "git add" to track)
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main)
+$ git add .gitignore
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main)
+$ git commit -m 'git: add file .gitignore'
+[main 04e463f] git: add file .gitignore
+ 1 file changed, 2 insertions(+)
+ create mode 100644 .gitignore
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main)
+$
+
+
+
+12. ΠŸΠΎΠΏΡ€ΠΎΠ±ΠΎΠ²Π°Π» ΠΈΡΠΏΠΎΠ»ΡŒΠ·ΠΎΠ²Π°Ρ‚ΡŒ всС ΠΏΡ€ΠΈΠ²Π΅Π΄Π΅Π½Π½Ρ‹Π΅ ΠΊΠΎΠΌΠ°Π½Π΄Ρ‹ для просмотра истории ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ ΠΏΡ€ΠΎΠ΅ΠΊΡ‚Π°.
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main)
+$ git log --stat
+commit 04e463ff24c12adbe1e8aa6c252f7ac1eb39cc62 (HEAD -> main) (Ρ…Π΅Ρˆ ΠΊΠΎΠΌΠΌΠΈΡ‚Π°)
+Author: Alice (OvsiannikovRS) <OvsiannikovRS@mpei.ru>	       (Π°Π²Ρ‚ΠΎΡ€ ΠΈ эл ΠΏΠΎΡ‡Ρ‚Π° Π°Π²Ρ‚ΠΎΡ€Π° ΠΊΠΎΠΌΠΌΠΈΡ‚Π°)
+Date:   Mon Apr 7 02:40:12 2025 +0300			       (Π΄Π°Ρ‚Π° ΠΈ врСмя ΠΊΠΎΠΌΠΌΠΈΡ‚Π°)
+
+    git: add file .gitignore                                   (описаниС ΠΊΠΎΠΌΠΌΠΈΡ‚Π°)
+
+ .gitignore | 2 ++
+ 1 file changed, 2 insertions(+)			       (количСство ΠΈΠ·ΠΌΠ΅Π½Π΅Π½Π½Ρ‹Ρ… Ρ„Π°ΠΉΠ»ΠΎΠ²)
+
+commit 2fdb42dffa15d390c57dac57ecee7eb64b160d77
+Author: Alice (OvsiannikovRS) <OvsiannikovRS@mpei.ru>
+Date:   Mon Apr 7 02:33:01 2025 +0300
+
+    code: add difference A&B
+
+ main.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+commit 25f963d3e4eaf2c14316ca1d007c8a886c296b44
+Author: Alice (OvsiannikovRS) <OvsiannikovRS@mpei.ru>
+Date:   Mon Apr 7 02:30:42 2025 +0300
+
+    code: add sum A&B
+
+ main.cpp | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+commit 5319550073578cc85d3fa76162866183740d0b7f
+Author: Alice (OvsiannikovRS) <OvsiannikovRS@mpei.ru>
+Date:   Mon Apr 7 02:22:34 2025 +0300
+
+    build: add project file
+
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main)
+$ git log --oneline --decorate
+04e463f (HEAD -> main) git: add file .gitignore
+2fdb42d code: add difference A&B
+25f963d code: add sum A&B
+5319550 build: add project file
+90e7c97 code: Π·Π°Π³ΠΎΡ‚ΠΎΠ²ΠΊΠ° ΠΏΡ€ΠΎΠ³Ρ€Π°ΠΌΠΌΡ‹
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main)
+$ git log --oneline --decorate --all --graph
+* 04e463f (HEAD -> main) git: add file .gitignore
+* 2fdb42d code: add difference A&B
+* 25f963d code: add sum A&B
+* 5319550 build: add project file
+* 90e7c97 code: Π·Π°Π³ΠΎΡ‚ΠΎΠ²ΠΊΠ° ΠΏΡ€ΠΎΠ³Ρ€Π°ΠΌΠΌΡ‹
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main)
+$
+
+
+
+13. НашСл ΠΊΠΎΠΌΠΌΠΈΡ‚Ρ‹ ΠΏΠΎ Ρ‚Π΅ΠΌΠ΅ build, Π·Π°Ρ‚Π΅ΠΌ Π·Π°Ρ‚Ρ€Π°Π³ΠΈΠ²Π°ΡŽΡ‰ΠΈΠ΅ Ρ„Π°ΠΉΠ» project.cbp
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main)
+$ git log --grep 'build'
+commit 5319550073578cc85d3fa76162866183740d0b7f
+Author: Alice (OvsiannikovRS) <OvsiannikovRS@mpei.ru>
+Date:   Mon Apr 7 02:22:34 2025 +0300
+
+    build: add project file
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main)
+$ git log -- project.cbp
+commit 5319550073578cc85d3fa76162866183740d0b7f
+Author: Alice (OvsiannikovRS) <OvsiannikovRS@mpei.ru>
+Date:   Mon Apr 7 02:22:34 2025 +0300
+
+    build: add project file
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main)
+$
+
+
+
+14. ΠŸΡ€ΠΎΡΠΌΠΎΡ‚Ρ€Π΅Π» прСдпослСдний ΠΊΠΎΠΌΠΌΠΈΡ‚.
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main)
+$ git show HEAD~1
+commit 2fdb42dffa15d390c57dac57ecee7eb64b160d77
+Author: Alice (OvsiannikovRS) <OvsiannikovRS@mpei.ru>
+Date:   Mon Apr 7 02:33:01 2025 +0300
+
+    code: add difference A&B
+
+diff --git a/main.cpp b/main.cpp
+index 4364dbc..3ec5517 100644
+--- a/main.cpp
++++ b/main.cpp
+@@ -7,5 +7,7 @@ int main()
+     cout << "Enter A and B: ";
+     int a, b;
+     cin >> a >> b;
+-    cout << "A + B = " << a + b << '\n';
++    cout << "A + B = " << a + b << '\n'
++     << "A - B = " << a - b << '\n';
++
+ }
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main)
+$
+
+
+
+15. ВнСс измСнСния Π² ΠΊΠΎΠ΄, просмотрСл измСнСния Π² Ρ€Π°Π±ΠΎΡ‡Π΅ΠΉ ΠΊΠΎΠΏΠΈΠΈ.
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main)
+$ git diff
+diff --git a/main.cpp b/main.cpp
+index 3ec5517..11e84f5 100644
+--- a/main.cpp
++++ b/main.cpp
+@@ -8,6 +8,7 @@ int main()
+     int a, b;
+     cin >> a >> b;
+     cout << "A + B = " << a + b << '\n'
+-     << "A - B = " << a - b << '\n'; (удалСнная строка)
++     << "A - B = " << a - b << '\n'  (Π΄ΠΎΠ±Π°Π²ΠΎΠ΅Π½Π½Ρ‹Π΅ строки)
++     << "A * B = " << a * b << '\n';
+
+ }
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main)
+$
+
+
+
+16. ΠŸΡ€ΠΎΡΠΌΠΎΡ‚Ρ€Π΅Π» измСнСния ΠΌΠ΅ΠΆΠ΄Ρƒ ΠΏΠ΅Ρ€Π²Ρ‹ΠΌ ΠΊΠΎΠΌΠΌΠΈΡ‚ΠΎΠΌ ΠΈ ΠΊΠΎΠΌΠΌΠΈΡ‚ΠΎΠΌ Π΄ΠΎΠ±Π°Π²Π»ΡΡŽΡ‰ΠΈΠΌ Π²Ρ‹Π²ΠΎΠ΄ разности чисСл А ΠΈ Π’.
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main)
+$ git diff 90e7c97 2fdb42d
+diff --git a/main.cpp b/main.cpp
+index b4392ec..3ec5517 100644
+--- a/main.cpp
++++ b/main.cpp
+@@ -4,6 +4,10 @@ using namespace std;
+
+ int main()
+ {
+-    cout << "Hello world!" << endl;
+-    return 0;
++    cout << "Enter A and B: ";
++    int a, b;
++    cin >> a >> b;
++    cout << "A + B = " << a + b << '\n'
++     << "A - B = " << a - b << '\n';
++
+ }
+diff --git a/project.cbp b/project.cbp
+new file mode 100644
+index 0000000..99bb702
+--- /dev/null
++++ b/project.cbp
+@@ -0,0 +1,40 @@
++<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
++<CodeBlocks_project_file>
++       <FileVersion major="1" minor="6" />
++       <Project>
++               <Option title="project" />
++               <Option pch_mode="2" />
++               <Option compiler="gcc" />
++               <Build>
++                       <Target title="Debug">
++                               <Option output="bin/Debug/project" prefix_auto="1" extension_auto="1" />
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main)
+$
+
+
+
+17. Π—Π°ΠΊΠΎΠΌΠΈΡ‚ΠΈΠ» измСнСния Π² Ρ€Π°Π±ΠΎΡ‡Π΅ΠΉ ΠΊΠΎΠΏΠΈΠΈ, Π΄ΠΎΠ±Π°Π²ΠΈΠ» ΠΊΠΎΠΌΠΌΠ΅Π½Ρ‚Π°Ρ€ΠΈΠΉ Π½Π°Π΄ Ρ„ΡƒΠ½ΠΊΡ†ΠΈΠ΅ΠΉ main, ΠΎΡ‚ΠΊΠ°Ρ‚ΠΈΠ» ΠΏΡ€ΠΎΠ΅ΠΊΡ‚ ΠΊ послСднСму ΠΊΠΎΠΌΠΌΠΈΡ‚Ρƒ.
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main)
+$ git add main.cpp
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main)
+$ git commit -m 'code: add myltiplying A&B'
+[main d4d8d4d] code: add myltiplying A&B
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main)
+$ git checkout HEAD -- main.cpp
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main)
+$
+
+
+
+18. Π‘ΠΎΠ·Π΄Π°Π» ΠΏΠ°Ρ€Ρƒ ΠΊΠ»ΡŽΡ‡Π΅ΠΉ, Π·Π°Π΄Π°Π» ΠΏΠ°Ρ€ΠΎΠ»ΡŒ, запустил Π°Π³Π΅Π½Ρ‚Π° ΠΈ Π·Π°Π³Ρ€ΡƒΠ·ΠΈΠ» ΠΊΠ»ΡŽΡ‡.
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main)
+$ ssh-keygen
+Generating public/private ed25519 key pair.
+Enter file in which to save the key (/c/Users/daemo/.ssh/id_ed25519):
+Created directory '/c/Users/daemo/.ssh'.
+Enter passphrase for "/c/Users/daemo/.ssh/id_ed25519" (empty for no passphrase):
+Enter same passphrase again:
+Your identification has been saved in /c/Users/daemo/.ssh/id_ed25519
+Your public key has been saved in /c/Users/daemo/.ssh/id_ed25519.pub
+The key fingerprint is:
+SHA256:GMXBL7KVExE0U2qo3S9nT1lqeko8eJ2fStiAaY+IrcM abdxshba)))@abdxshba
+The key's randomart image is:
++--[ED25519 256]--+
+|       +O=.      |
+|       o++       |
+|      o o+       |
+|     o.==o.      |
+|    . o+So.   .  |
+|     o.o * = =   |
+|   .. o + @ X    |
+|    E.   * B.. . |
+|    ..    ooo.o  |
++----[SHA256]-----+
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main)
+$ eval$(ssh-agent -s)
+bash: evalSSH_AUTH_SOCK=/tmp/ssh-1ITLvYAYGFG0/agent.564;: No such file or directory
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main)
+$ eval $(ssh-agent -s)
+Agent pid 572
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main)
+$ ssh-add
+Enter passphrase for /c/Users/daemo/.ssh/id_ed25519:
+Identity added: /c/Users/daemo/.ssh/id_ed25519 (abdxshba)))@abdxshba)
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main)
+$
+
+
+
+19. Π”ΠΎΠ±Π°Π²ΠΈΠ» ΠΊΠ»ΡŽΡ‡ Π² список ΠΎΡ‚ΠΊΡ€Ρ‹Ρ‚Ρ‹Ρ… ΠΊΠ»ΡŽΡ‡Π΅ΠΉ ΡƒΡ‡Π΅Ρ‚Π½ΠΎΠΉ записи Π½Π° сСрвСрС.
+
+
+
+20. ΠžΡ‚ΠΏΡ€Π°Π²ΠΈΠ» ΠΏΡ€ΠΎΠ΅ΠΊΡ‚ Π½Π° сСрвСр.
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main)
+$ git remote add origin git@uit.mpei.ru:OvsiannikovRS/cs-lab02.git
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main)
+$ git push -u origin main
+The authenticity of host 'uit.mpei.ru (193.233.68.149)' can't be established.
+ED25519 key fingerprint is SHA256:Q5w0UKEzQKA3J6NyMtjwCLvtAykoxdugIXjx6NwU4NA.
+This key is not known by any other names.
+Are you sure you want to continue connecting (yes/no/[fingerprint])? yes
+Warning: Permanently added 'uit.mpei.ru' (ED25519) to the list of known hosts.
+Enumerating objects: 21, done.
+Counting objects: 100% (21/21), done.
+Delta compression using up to 16 threads
+Compressing objects: 100% (18/18), done.
+Writing objects: 100% (21/21), 2.44 KiB | 625.00 KiB/s, done.
+Total 21 (delta 3), reused 0 (delta 0), pack-reused 0 (from 0)
+remote: . Processing 1 references
+remote: Processed 1 references in total
+To uit.mpei.ru:OvsiannikovRS/cs-lab02.git
+ * [new branch]      main -> main
+branch 'main' set up to track 'origin/main'.
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main)
+$
+
+
+
+21. ΠšΠ»ΠΎΠ½ΠΈΡ€ΠΎΠ²Π°Π» ΠΏΡ€ΠΎΠ΅ΠΊΡ‚ Π½Π° ΠΌΠ°ΡˆΠΈΠ½Ρƒ Π±ΠΎΠ±Π°.
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/bob
+$ git clone git@uit.mpei.ru:OvsiannikovRS/cs-lab02.git project
+Cloning into 'project'...
+Enter passphrase for key '/c/Users/daemo/.ssh/id_ed25519':
+remote: Enumerating objects: 21, done.
+remote: Counting objects: 100% (21/21), done.
+remote: Compressing objects: 100% (18/18), done.
+remote: Total 21 (delta 3), reused 0 (delta 0), pack-reused 0
+Receiving objects: 100% (21/21), done.
+Resolving deltas: 100% (3/3), done.
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/bob
+$ cd project
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/bob/project (main)
+$
+
+
+
+22. Настроил git Π½Π° машинС Π±ΠΎΠ±Π°.
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/bob/project (main)
+$ git config user.name 'Bob (OvsiannikovRS)'
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/bob/project (main)
+$ git config user.email 'OvsiannikovRS@mpei.ru'
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/bob/project (main)
+$
+
+
+
+
+23. ИзмСнил ΠΊΠΎΠ΄ ΠΈ ΠΎΡ‚ΠΏΡ€Π°Π²ΠΈΠ» измСнСния Π½Π° сСрвСр ΠΎΡ‚ Π»ΠΈΡ†Π° Π±ΠΎΠ±Π°.
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/bob/project (main)
+$ git add main.cpp
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/bob/project (main)
+$ git commit -m 'code: add comment'
+[main 7104774] code: add comment
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/bob/project (main)
+$ git push
+Enter passphrase for key '/c/Users/daemo/.ssh/id_ed25519':
+Enumerating objects: 5, done.
+Counting objects: 100% (5/5), done.
+Delta compression using up to 16 threads
+Compressing objects: 100% (3/3), done.
+Writing objects: 100% (3/3), 311 bytes | 311.00 KiB/s, done.
+Total 3 (delta 2), reused 0 (delta 0), pack-reused 0 (from 0)
+remote: . Processing 1 references
+remote: Processed 1 references in total
+To uit.mpei.ru:OvsiannikovRS/cs-lab02.git
+   a84f534..7104774  main -> main
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/bob/project (main)
+$
+
+
+
+
+24. Π’ΠΏΠΎΠ»Π½ΠΈΠ» Π·Π°Π³Ρ€ΡƒΠ·ΠΊΡƒ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ Π½Π° машинС алисы, посмотрСл ΠΈΡΡ‚ΠΎΡ€ΠΈΡŽ всСх Π²Π΅Ρ‚ΠΎΠΊ.
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/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 2), reused 0 (delta 0), pack-reused 0
+Unpacking objects: 100% (3/3), 291 bytes | 48.00 KiB/s, done.
+From uit.mpei.ru:OvsiannikovRS/cs-lab02
+   a84f534..7104774  main       -> origin/main
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main)
+$ git log --oneline --decorate --all --graph
+* 7104774 (origin/main, origin/HEAD) code: add comment
+* a84f534 first commit
+* d4d8d4d code: add myltiplying A&B
+* 04e463f (HEAD -> main) git: add file .gitignore
+* 2fdb42d code: add difference A&B
+* 25f963d code: add sum A&B
+* 5319550 build: add project file
+* 90e7c97 code: Π·Π°Π³ΠΎΡ‚ΠΎΠ²ΠΊΠ° ΠΏΡ€ΠΎΠ³Ρ€Π°ΠΌΠΌΡ‹
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main)
+$
+
+
+
+25. ΠŸΡ€ΠΎΠ΄Π²ΠΈΠ½ΡƒΠ» Π²Π΅Ρ‚ΠΊΡƒ main ΠΊ скачанной вСрсии Π½Π° машинС Алисы.
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main)
+$ git log --oneline --decorate --all --graph
+* 7104774 (origin/main, origin/HEAD) code: add comment
+* a84f534 (HEAD -> main) first commit
+* d4d8d4d code: add myltiplying A&B
+* 04e463f git: add file .gitignore
+* 2fdb42d code: add difference A&B
+* 25f963d code: add sum A&B
+* 5319550 build: add project file
+* 90e7c97 code: Π·Π°Π³ΠΎΡ‚ΠΎΠ²ΠΊΠ° ΠΏΡ€ΠΎΠ³Ρ€Π°ΠΌΠΌΡ‹
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main)
+$ git pull --ff-only
+Updating a84f534..7104774
+Fast-forward
+ main.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main)
+$
+
+
+
+26. Π”ΠΎΠ±Π°Π²ΠΈΠ» Π² ΠΊΠΎΠ΄ Π΄Π΅Π»Π΅Π½ΠΈΠ΅ c ΠΌΠ°ΡˆΠΈΠ½Ρ‹ Π±ΠΎΠ±Π°, Π·Π°Π³Ρ€ΡƒΠ·ΠΈΠ» Π½Π° сСрвСр, скачал Π½Π° ΠΌΠ°ΡˆΠΈΠ½Ρƒ алисы, ΠΏΡ€ΠΎΠ΄Π²ΠΈΠ½ΡƒΠ» Π²Π΅Ρ‚ΠΊΡƒ main ΠΊ скачанной вСрсии Π½Π° машинС Алисы.
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/bob/project (main)
+$ git add main.cpp
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/bob/project (main)
+$ git commit -m 'code: add division'
+[main 014c86d] code: add division
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/bob/project (main)
+$ git push
+Enter passphrase for key '/c/Users/daemo/.ssh/id_ed25519':
+Enumerating objects: 5, done.
+Counting objects: 100% (5/5), done.
+Delta compression using up to 16 threads
+Compressing objects: 100% (3/3), done.
+Writing objects: 100% (3/3), 336 bytes | 336.00 KiB/s, done.
+Total 3 (delta 2), reused 0 (delta 0), pack-reused 0 (from 0)
+remote: . Processing 1 references
+remote: Processed 1 references in total
+To uit.mpei.ru:OvsiannikovRS/cs-lab02.git
+   7104774..014c86d  main -> main
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/bob/project (main)
+$
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/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 2), reused 0 (delta 0), pack-reused 0
+Unpacking objects: 100% (3/3), 316 bytes | 35.00 KiB/s, done.
+From uit.mpei.ru:OvsiannikovRS/cs-lab02
+   7104774..014c86d  main       -> origin/main
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main)
+$ git pull --ff-only
+Updating 7104774..014c86d
+Fast-forward
+ main.cpp | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+
+
+27. Π”ΠΎΠ±Π°Π²ΠΈΠ» Π²Ρ‹Π²ΠΎΠ΄ максимума Π² ΠΊΠΎΠ΄Π΅ алисы, сдСлал ΠΊΠΎΠΌΠΌΠΈΡ‚ ΠΈ ΠΎΡ‚ΠΏΡ€Π°Π²ΠΈΠ» Π½Π° ΡΠ΅Ρ€Π²Π΅Ρ€ΡŽ.
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main)
+$ git add main.cpp
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main)
+$ git commit -m 'code: add max'
+[main 8bb0b62] code: add max
+ 1 file changed, 2 insertions(+)
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main)
+$ git push
+Enumerating objects: 5, done.
+Counting objects: 100% (5/5), done.
+Delta compression using up to 16 threads
+Compressing objects: 100% (3/3), done.
+Writing objects: 100% (3/3), 341 bytes | 341.00 KiB/s, done.
+Total 3 (delta 2), reused 0 (delta 0), pack-reused 0 (from 0)
+remote: . Processing 1 references
+remote: Processed 1 references in total
+To uit.mpei.ru:OvsiannikovRS/cs-lab02.git
+   014c86d..8bb0b62  main -> main
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main)
+$
+
+
+
+28. Π”ΠΎΠ±Π°Π²ΠΈΠ» Π²Ρ‹Π²ΠΎΠ΄ ΠΌΠΈΠ½ΠΈΠΌΡƒΠΌΠ° Π² ΠΊΠΎΠ΄Π΅ Π±ΠΎΠ±Π°, сдСлал ΠΊΠΎΠΌΠΌΠΈΡ‚ ΠΈ попытался ΠΎΡ‚ΠΏΡ€Π°Π²ΠΈΡ‚ΡŒ Π½Π° ΡΠ΅Ρ€Π²Π΅Ρ€ΡŽ.
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/bob/project (main)
+$ git add main.cpp
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/bob/project (main)
+$ git commit -m 'code:add min'
+[main 1e2c0fc] code:add min
+ 1 file changed, 2 insertions(+)
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/bob/project (main)
+$ git push
+Enter passphrase for key '/c/Users/daemo/.ssh/id_ed25519':
+To uit.mpei.ru:OvsiannikovRS/cs-lab02.git
+ ! [rejected]        main -> main (fetch first)
+error: failed to push some refs to 'uit.mpei.ru:OvsiannikovRS/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.
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/bob/project (main)
+$
+
+
+29. Π—Π°Π³Ρ€ΡƒΠ·ΠΈΠ» ΠΊΠΎΠΌΠΌΠΈΡ‚Ρ‹ ΠΈΠ· ΡƒΠ΄Π°Π»Π΅Π½Π½ΠΎΠ³ΠΎ Ρ…Ρ€Π°Π½ΠΈΠ»ΠΈΡ‰Π° ΠΈ ΠΎΡ‚ΠΎΠ±Ρ€Π°Π·ΠΈΠ» ΠΈΡΡ‚ΠΎΡ€ΠΈΡŽ всСх Π²Π΅Ρ‚ΠΎΠΊ.
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/bob/project (main)
+$ git fetch
+Enter passphrase for key '/c/Users/daemo/.ssh/id_ed25519':
+remote: Enumerating objects: 5, done.
+remote: Counting objects: 100% (5/5), done.
+remote: Compressing objects: 100% (3/3), done.
+remote: Total 3 (delta 2), reused 0 (delta 0), pack-reused 0
+Unpacking objects: 100% (3/3), 321 bytes | 35.00 KiB/s, done.
+From uit.mpei.ru:OvsiannikovRS/cs-lab02
+   014c86d..8bb0b62  main       -> origin/main
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/bob/project (main)
+$ git log --oneline --decorate --all --graph
+* 1e2c0fc (HEAD -> main) code:add min
+| * 8bb0b62 (origin/main, origin/HEAD) code: add max
+|/
+* 014c86d code: add division
+* 7104774 code: add comment
+* a84f534 first commit
+* d4d8d4d code: add myltiplying A&B
+* 04e463f git: add file .gitignore
+* 2fdb42d code: add difference A&B
+* 25f963d code: add sum A&B
+* 5319550 build: add project file
+* 90e7c97 code: Π·Π°Π³ΠΎΡ‚ΠΎΠ²ΠΊΠ° ΠΏΡ€ΠΎΠ³Ρ€Π°ΠΌΠΌΡ‹
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/bob/project (main)
+$
+
+
+
+30. ΠŸΡ€ΠΎΡΠΌΠΎΡ‚Ρ€Π΅Π» состояниС Ρ…Ρ€Π°Π½ΠΈΠ»ΠΈΡ‰Π° Π½Π° машинС Π±ΠΎΠ±Π°.
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/bob/project (main|REBASE 1/1)
+$ git status
+interactive rebase in progress; onto 8bb0b62
+Last command done (1 command done):
+   pick 1e2c0fc code:add min
+No commands remaining.
+You are currently rebasing branch 'main' on '8bb0b62'.
+  (fix conflicts and then run "git rebase --continue")
+  (use "git rebase --skip" to skip this patch)
+  (use "git rebase --abort" to check out the original branch)
+
+Unmerged paths:
+  (use "git restore --staged <file>..." to unstage)
+  (use "git add <file>..." to mark resolution)
+        both modified:   main.cpp
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+        project.depend
+
+no changes added to commit (use "git add" and/or "git commit -a")
+
+
+
+31. ΠžΡ‚Ρ€Π΅Π΄Π°ΠΊΡ‚ΠΈΡ€ΠΎΠ²Π°Π» ΠΊΠΎΠ΄ Π±ΠΎΠ±Π°, Π΄ΠΎΠ±Π°Π²ΠΈΠ» main/cpp Π² индСкс ΠΈ ΠΏΡ€ΠΎΠ΄ΠΎΠ»ΠΆΠΈΠ» ΠΎΠΏΠ΅Ρ€Π°Ρ†ΠΈΡŽ rebase.
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/bob/project (main|REBASE 1/1)
+$ git add main.cpp
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/bob/project (main|REBASE 1/1)
+$ git rebase --continue
+Successfully rebased and updated refs/heads/main.
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/bob/project (main)
+$
+
+
+
+32. ΠŸΡ€ΠΎΠ²Π΅Ρ€ΠΈΠ» ΠΈΡΡ‚ΠΎΡ€ΠΈΡŽ Ρ…Ρ€Π°Π½ΠΈΠ»ΠΈΡ‰Π°, ΠΎΡ‚ΠΏΡ€Π°Π²ΠΈΠ» измСнСния Π½Π° сСрвСр.
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/bob/project (main)
+$ git log --oneline --decorate --all --graph
+* d837927 (HEAD -> main) code:add min
+* 8bb0b62 (origin/main, origin/HEAD) code: add max
+* 014c86d code: add division
+* 7104774 code: add comment
+* a84f534 first commit
+* d4d8d4d code: add myltiplying A&B
+* 04e463f git: add file .gitignore
+* 2fdb42d code: add difference A&B
+* 25f963d code: add sum A&B
+* 5319550 build: add project file
+* 90e7c97 code: Π·Π°Π³ΠΎΡ‚ΠΎΠ²ΠΊΠ° ΠΏΡ€ΠΎΠ³Ρ€Π°ΠΌΠΌΡ‹
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/bob/project (main)
+$ git push
+Enter passphrase for key '/c/Users/daemo/.ssh/id_ed25519':
+Enumerating objects: 5, done.
+Counting objects: 100% (5/5), done.
+Delta compression using up to 16 threads
+Compressing objects: 100% (3/3), done.
+Writing objects: 100% (3/3), 363 bytes | 363.00 KiB/s, done.
+Total 3 (delta 2), reused 0 (delta 0), pack-reused 0 (from 0)
+remote: . Processing 1 references
+remote: Processed 1 references in total
+To uit.mpei.ru:OvsiannikovRS/cs-lab02.git
+   8bb0b62..d837927  main -> main
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/bob/project (main)
+$ git log --oneline --decorate --all --graph
+* d837927 (HEAD -> main, origin/main, origin/HEAD) code:add min
+* 8bb0b62 code: add max
+* 014c86d code: add division
+* 7104774 code: add comment
+* a84f534 first commit
+* d4d8d4d code: add myltiplying A&B
+* 04e463f git: add file .gitignore
+* 2fdb42d code: add difference A&B
+* 25f963d code: add sum A&B
+* 5319550 build: add project file
+* 90e7c97 code: Π·Π°Π³ΠΎΡ‚ΠΎΠ²ΠΊΠ° ΠΏΡ€ΠΎΠ³Ρ€Π°ΠΌΠΌΡ‹
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/bob/project (main)
+$
+
+
+
+33. Π‘ΠΎΠ·Π΄Π°Π» Π²Π΅Ρ‚ΠΊΡƒ double ΠΈ ΠΏΠ΅Ρ€Π΅ΡˆΠ΅Π» Π² Π½Π΅Π΅.
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main)
+$ git branch double
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main)
+$ git checkout double
+M       project.cbp
+Switched to branch 'double'
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (double)
+$
+
+
+
+34. Π‘ΠΈΠ½Ρ…Ρ€ΠΎΠ½ΠΈΠ·ΠΈΡ€ΠΎΠ²Π°Π» Π²Π΅Ρ‚ΠΊΡƒ main Π½Π° машинС Алисы с сСрвСром. ΠŸΡ€ΠΎΡΠΌΠΎΡ‚Ρ€Π΅Π» ΠΈΡΡ‚ΠΎΡ€ΠΈΡŽ всСх Π²Π΅Ρ‚ΠΎΠΊ.
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (double)
+$ git checkout main
+M       project.cbp
+Switched to branch 'main'
+Your branch is behind 'origin/main' by 1 commit, and can be fast-forwarded.
+  (use "git pull" to update your local branch)
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main)
+$ git fetch
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main)
+$ git pull --ff-only
+Updating 8bb0b62..d837927
+Fast-forward
+ main.cpp | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main)
+$ git log --oneline --decorate --all --graph
+*   93c4bc2 (HEAD -> main, origin/main, origin/HEAD) сборка всСго
+|\
+| * e7ee40f (double) code: from int to double
+* | d837927 code:add min
+|/
+* 8bb0b62 code: add max
+* 014c86d code: add division
+* 7104774 code: add comment
+* a84f534 first commit
+* d4d8d4d code: add myltiplying A&B
+* 04e463f git: add file .gitignore
+* 2fdb42d code: add difference A&B
+* 25f963d code: add sum A&B
+* 5319550 build: add project file
+* 90e7c97 code: Π·Π°Π³ΠΎΡ‚ΠΎΠ²ΠΊΠ° ΠΏΡ€ΠΎΠ³Ρ€Π°ΠΌΠΌΡ‹
+
+abdxshba)))@abdxshba MINGW64 ~/OneDrive/Π Π°Π±ΠΎΡ‡ΠΈΠΉ стол/lab02/alice/project (main)
+$
+
+
+
+