diff --git a/Git Alice b/Git Alice
new file mode 100644
index 0000000..ffe66ab
--- /dev/null
+++ b/Git Alice	
@@ -0,0 +1,1108 @@
+
+user@MICHAELD032 CLANGARM64 ~
+$ cd
+AppData/
+Application Data/
+Contacts/
+Cookies/
+Desktop/
+Documents/
+Downloads/
+Favorites/
+Links/
+Local Settings/
+Music/
+NTUSER.DAT
+NTUSER.DAT{92107cdd-f200-11ef-9b0a-bd0c85d565e3}.TM.blf
+NTUSER.DAT{92107cdd-f200-11ef-9b0a-bd0c85d565e3}.TMContainer00000000000000000001.regtrans-ms
+NTUSER.DAT{92107cdd-f200-11ef-9b0a-bd0c85d565e3}.TMContainer00000000000000000002.regtrans-ms
+NetHood/
+Pictures/
+PrintHood/
+Recent/
+Saved Games/
+Searches/
+SendTo/
+Videos/
+ntuser.dat.LOG1
+ntuser.dat.LOG2
+ntuser.ini
+source/
+Мои документы/
+Шаблоны/
+главное меню/
+// Начало Лабораторной работы 
+
+user@MICHAELD032 CLANGARM64 ~
+$ cd ..
+
+user@MICHAELD032 CLANGARM64 /c/Users
+$ cd user/
+
+user@MICHAELD032 CLANGARM64 ~
+$ cd source/
+
+user@MICHAELD032 CLANGARM64 ~/source
+$ cd repos/
+
+user@MICHAELD032 CLANGARM64 ~/source/repos
+$ cd lab02/
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02
+$ mkdir alice
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02
+$ mkdir bob
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02
+$ cd alice/
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice
+$ mkdir project
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice
+$ cd project/
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project
+$ cd ..
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice
+$ cd ..
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02
+$ cd alice/
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice
+$ cd project/
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project
+$ ^C
+
+
+//Инициализация репозитария и настройка git 
+
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project
+$ git init
+Initialized empty Git repository in C:/Users/user/source/repos/lab02/alice/project/.git/
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (master)
+$ git branch -m main
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ ls -A
+.git/
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git config user.name 'Alice (SukhotinMD)'
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git config user.email 'SukhotinMD@mpei.ru'
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ ls
+project/
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ ls
+project/  project.sln
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git status
+On branch main
+
+No commits yet
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+        .vs/
+        project.sln
+        project/
+
+nothing added to commit but untracked files present (use "git add" to track)
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ cd project
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project/project (main)
+$ git status
+On branch main
+
+No commits yet
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+        ../.vs/
+        ../project.sln
+        ./
+
+nothing added to commit but untracked files present (use "git add" to track)
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project/project (main)
+$ cd ..
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git status
+On branch main
+
+No commits yet
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+        .vs/
+        project.sln
+        project/
+
+nothing added to commit but untracked files present (use "git add" to track)
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ cd project
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project/project (main)
+$ git status
+On branch main
+
+No commits yet
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+        ../.vs/
+        ../project.sln
+        ./
+
+nothing added to commit but untracked files present (use "git add" to track)
+
+
+// Занесение файлов под контроль версий
+
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project/project (main)
+$ cd project.
+project.cpp              project.vcxproj.filters
+project.vcxproj          project.vcxproj.user
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project/project (main)
+$ git add project.cpp
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project/project (main)
+$ git status
+On branch main
+
+No commits yet
+
+Changes to be committed:
+  (use "git rm --cached <file>..." to unstage)
+        new file:   project.cpp
+
+// Добавление нового файла к коммит, раньше его не было, поэтому оператор new, остальные файлы не вносятся в git
+
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+        ../.vs/
+        ../project.sln
+        project.vcxproj
+        project.vcxproj.filters
+        project.vcxproj.user
+
+
+// Создание коммитов с изменениями 
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project/project (main)
+$ ^[[200~git commit -m 'code: заготовка программы'
+bash: $'\E[200~git': command not found
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project/project (main)
+$ git commit -m 'code: заготовка программы'
+[main (root-commit) 6bb59ae] code: заготовка программы
+ 1 file changed, 20 insertions(+)
+ create mode 100644 project/project.cpp
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project/project (main)
+$ ^C
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project/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:   project.cpp
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+        ../.vs/
+        ../ARM64/
+        ../project.sln
+        ARM64/
+        project.vcxproj
+        project.vcxproj.filters
+        project.vcxproj.user
+
+no changes added to commit (use "git add" and/or "git commit -a")
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project/project (main)
+$ git add main.cpp
+fatal: pathspec 'main.cpp' did not match any files
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project/project (main)
+$ git add project.cpp
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project/project (main)
+$ git status
+On branch main
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+        modified:   project.cpp
+
+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:   project.cpp
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+        ../.vs/
+        ../ARM64/
+        ../project.sln
+        ARM64/
+        project.vcxproj
+        project.vcxproj.filters
+        project.vcxproj.user
+
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project/project (main)
+$ git add project.cpp
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project/project (main)
+$ git commit -m "code: Добавление кода из описания лабы"
+[main 478e763] code: Добавление кода из описания лабы
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project/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:   project.cpp
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+        ../.vs/
+        ../ARM64/
+        ../project.sln
+        ARM64/
+        project.vcxproj
+        project.vcxproj.filters
+        project.vcxproj.user
+
+no changes added to commit (use "git add" and/or "git commit -a")
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project/project (main)
+$ git add -u
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project/project (main)
+$ git commit -m "code: Добавлена вывод суммы в код"
+[main 9568ca1] code: Добавлена вывод суммы в код
+ 1 file changed, 1 insertion(+)
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project/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:   project.cpp
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+        ../.vs/
+        ../ARM64/
+        ../project.sln
+        ARM64/
+        project.vcxproj
+        project.vcxproj.filters
+        project.vcxproj.user
+
+no changes added to commit (use "git add" and/or "git commit -a")
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project/project (main)
+$ git commit -a -m "code: Сумма и разность по заготовке"
+[main 0fd5b86] code: Сумма и разность по заготовке
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+// Игнорирование файлов
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project/project (main)
+$ git status
+On branch main
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+        ../.gitignore
+        ../.vs/
+        ../ARM64/
+        ../project.sln
+        ARM64/
+        project.vcxproj
+        project.vcxproj.filters
+        project.vcxproj.user
+
+nothing added to commit but untracked files present (use "git add" to track)
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project/project (main)
+$ git add .gitignore
+fatal: pathspec '.gitignore' did not match any files
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project/project (main)
+$ git add gitignore
+fatal: pathspec 'gitignore' did not match any files
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project/project (main)
+$ git add
+ARM64/                   project.vcxproj.filters
+project.vcxproj          project.vcxproj.user
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project/project (main)
+$ git add
+ARM64/                   project.vcxproj.filters
+project.vcxproj          project.vcxproj.user
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project/project (main)
+$ cd ..
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git add .gitignore
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git status
+On branch main
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+        new file:   .gitignore
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+        .vs/
+        ARM64/
+        project.sln
+        project/ARM64/
+        project/project.vcxproj
+        project/project.vcxproj.filters
+        project/project.vcxproj.user
+
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git commit "build: gitignore"
+error: pathspec 'build: gitignore' did not match any file(s) known to git
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git statis
+git: 'statis' is not a git command. See 'git --help'.
+
+The most similar command is
+        status
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git status
+On branch main
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+        new file:   .gitignore
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+        .vs/
+        ARM64/
+        project.sln
+        project/ARM64/
+        project/project.vcxproj
+        project/project.vcxproj.filters
+        project/project.vcxproj.user
+
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git commit -m "build: gitignore"
+[main 2b3d2ab] build: gitignore
+ 1 file changed, 2 insertions(+)
+ create mode 100644 .gitignore
+
+
+ // Просмотр истории
+
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git log --grep "build:"
+commit 2b3d2ab99dcb66b09a36b12280eb1c364f423ba5 (HEAD -> main)
+Author: Alice (SukhotinMD) <SukhotinMD@mpei.ru>
+Date:   Wed Mar 19 16:37:24 2025 +0300
+
+    build: gitignore
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git log -- project.sln
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git add project.sln
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git commit "build: Внесение файла проекта под git"
+error: pathspec 'build: Внесение файла проекта под git' did not match any file(s) known to git
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git commit -m "build: Внесение файла проекта под git"
+[main 2917583] build: Внесение файла проекта под git
+ 1 file changed, 37 insertions(+)
+ create mode 100644 project.sln
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git log -- project.sln
+commit 2917583106a2077a307ee4169aa02f5cab866047 (HEAD -> main)
+Author: Alice (SukhotinMD) <SukhotinMD@mpei.ru>
+Date:   Wed Mar 19 16:40:55 2025 +0300
+
+    build: Внесение файла проекта под git
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git log --stat
+commit 2917583106a2077a307ee4169aa02f5cab866047 (HEAD -> main)
+Author: Alice (SukhotinMD) <SukhotinMD@mpei.ru>
+Date:   Wed Mar 19 16:40:55 2025 +0300
+
+    build: Внесение файла проекта под git
+
+ project.sln | 37 +++++++++++++++++++++++++++++++++++++
+ 1 file changed, 37 insertions(+)
+
+commit 2b3d2ab99dcb66b09a36b12280eb1c364f423ba5
+Author: Alice (SukhotinMD) <SukhotinMD@mpei.ru>
+Date:   Wed Mar 19 16:37:24 2025 +0300
+
+    build: gitignore
+
+ .gitignore | 2 ++
+ 1 file changed, 2 insertions(+)
+
+commit 0fd5b86414c05b9f253f28b3d2ef7628d01a9829
+Author: Alice (SukhotinMD) <SukhotinMD@mpei.ru>
+Date:   Wed Mar 19 16:27:39 2025 +0300
+
+    code: Сумма и разность по заготовке
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git log --oneline --decorate
+2917583 (HEAD -> main) build: Внесение файла проекта под git
+2b3d2ab build: gitignore
+0fd5b86 code: Сумма и разность по заготовке
+9568ca1 code: Добавлена вывод суммы в код
+478e763 code: Добавление кода из описания лабы
+6bb59ae code: заготовка программы
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git log --oneline --decorate --all --graph
+* 2917583 (HEAD -> main) build: Внесение файла проекта под git
+* 2b3d2ab build: gitignore
+* 0fd5b86 code: Сумма и разность по заготовке
+* 9568ca1 code: Добавлена вывод суммы в код
+* 478e763 code: Добавление кода из описания лабы
+* 6bb59ae code: заготовка программы
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git log --grep --oneline
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git log --oneline --decorate --all --graph
+* 2917583 (HEAD -> main) build: Внесение файла проекта под git
+* 2b3d2ab build: gitignore
+* 0fd5b86 code: Сумма и разность по заготовке
+* 9568ca1 code: Добавлена вывод суммы в код
+* 478e763 code: Добавление кода из описания лабы
+* 6bb59ae code: заготовка программы
+
+// Для отчета просмотр коммита 3емя способами
+
+
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git show HEAD~1
+// 
+
+
+
+commit 2b3d2ab99dcb66b09a36b12280eb1c364f423ba5
+Author: Alice (SukhotinMD) <SukhotinMD@mpei.ru>
+Date:   Wed Mar 19 16:37:24 2025 +0300
+
+    build: gitignore
+
+diff --git a/.gitignore b/.gitignore
+new file mode 100644
+index 0000000..6653cff
+--- /dev/null
++++ b/.gitignore
+@@ -0,0 +1,2 @@
++/Debug
++/bin
+\ No newline at end of file
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git show main~1
+// 
+
+
+commit 2b3d2ab99dcb66b09a36b12280eb1c364f423ba5
+Author: Alice (SukhotinMD) <SukhotinMD@mpei.ru>
+Date:   Wed Mar 19 16:37:24 2025 +0300
+
+    build: gitignore
+
+diff --git a/.gitignore b/.gitignore
+new file mode 100644
+index 0000000..6653cff
+--- /dev/null
++++ b/.gitignore
+@@ -0,0 +1,2 @@
++/Debug
++/bin
+\ No newline at end of file
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git show ^[[200~
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git show 2b3d2ab99dcb66b09a36b12280eb1c364f423ba5
+//
+
+
+
+commit 2b3d2ab99dcb66b09a36b12280eb1c364f423ba5
+
+Author: Alice (SukhotinMD) <SukhotinMD@mpei.ru>
+Date:   Wed Mar 19 16:37:24 2025 +0300
+
+    build: gitignore
+
+diff --git a/.gitignore b/.gitignore
+new file mode 100644
+index 0000000..6653cff
+--- /dev/null
++++ b/.gitignore
+@@ -0,0 +1,2 @@
++/Debug
++/bin
+\ No newline at end of file
+
+
+
+
+
+
+
+
+// Конец
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git diff 6bb59ae  0fd5b86
+diff --git a/project/project.cpp b/project/project.cpp
+index a60f2ae..8520491 100644
+--- a/project/project.cpp
++++ b/project/project.cpp
+@@ -2,10 +2,18 @@
+ //
+
+ #include <iostream>
++using namespace std;
+
+ int main()
+ {
+-    std::cout << "Hello World!\n";
++    cout << "Enter A and B: ";
++    int a, b;
++    cin >> a >> b;
++    cout << "A + B = " << a + b << '\n'
++         << "A - B = " << a - b << '\n';
++
++
++
+ }
+
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git commit -m "code: Добавление произведения"
+On branch main
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+        .vs/
+        ARM64/
+        project/ARM64/
+        project/project.vcxproj
+        project/project.vcxproj.filters
+        project/project.vcxproj.user
+
+nothing added to commit but untracked files present (use "git add" to track)
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git status
+On branch main
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+        .vs/
+        ARM64/
+        project/ARM64/
+        project/project.vcxproj
+        project/project.vcxproj.filters
+        project/project.vcxproj.user
+
+nothing added to commit but untracked files present (use "git add" to track)
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/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:   project/project.cpp
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+        .vs/
+        ARM64/
+        project/ARM64/
+        project/project.vcxproj
+        project/project.vcxproj.filters
+        project/project.vcxproj.user
+
+no changes added to commit (use "git add" and/or "git commit -a")
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/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:   project/project.cpp
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+        .vs/
+        ARM64/
+        project/ARM64/
+        project/project.vcxproj
+        project/project.vcxproj.filters
+        project/project.vcxproj.user
+
+no changes added to commit (use "git add" and/or "git commit -a")
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git add project/project.
+fatal: pathspec 'project/project.' did not match any files
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git add project/project.cpp
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git commit -m "code: Добавление произведения"
+[main 01595ca] code: Добавление произведения
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+
+
+ //Откат изменений  и генерация ключей
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git reset --hard HEAD~1
+HEAD is now at 2917583 build: Внесение файла проекта под git
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git checkout HEAD -- project.cpp
+error: pathspec 'project.cpp' did not match any file(s) known to git
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git checkout HEAD -- project/project.cpp
+
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ ssh-keygen
+Generating public/private ed25519 key pair.
+Enter file in which to save the key (/c/Users/user/.ssh/id_ed25519):
+Created directory '/c/Users/user/.ssh'.
+Enter passphrase for "/c/Users/user/.ssh/id_ed25519" (empty for no passphrase):
+Enter same passphrase again:
+Your identification has been saved in /c/Users/user/.ssh/id_ed25519
+Your public key has been saved in /c/Users/user/.ssh/id_ed25519.pub
+The key fingerprint is:
+SHA256:mD64HGvElnqDKb6FwpuZCZdqbSIAFZX4qNyopqSUrdo user@MICHAELD032
+The key's randomart image is:
++--[ED25519 256]--+
+|  .+..           |
+|  o .            |
+| . o             |
+|. . .  o         |
+|o.o. .o S        |
+|+o+o=o           |
+|=*+Oo o          |
+|XB%+++ .         |
+|%@Eo+.           |
++----[SHA256]-----+
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ eval $(ssh-agent -s)
+Agent pid 1448
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ ssh-add
+Enter passphrase for /c/Users/user/.ssh/id_ed25519:
+Identity added: /c/Users/user/.ssh/id_ed25519 (user@MICHAELD032)
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ cat ~/.ssh/id_ed25519.pub
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHfGsfB0Y6zoPkhBJBc8/TUxfACN0v4oJQIQm/1beYd2 user@MICHAELD032
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git remote add origin git@uit.mpei.ru:SukhotinMD/cs-lab02.git
+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: 22, done.
+Counting objects: 100% (22/22), done.
+Delta compression using up to 4 threads
+Compressing objects: 100% (13/13), done.
+Writing objects: 100% (22/22), 3.12 KiB | 290.00 KiB/s, done.
+Total 22 (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:SukhotinMD/cs-lab02.git
+ * [new branch]      main -> main
+branch 'main' set up to track 'origin/main'.
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git remote -v
+origin  git@uit.mpei.ru:SukhotinMD/cs-lab02.git (fetch)
+origin  git@uit.mpei.ru:SukhotinMD/cs-lab02.git (push)
+
+
+
+// Совместная работа над проектом
+
+
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git clone git@uit.mpei.ru:SukhotinMD/cs-lab02.git project
+fatal: destination path 'project' already exists and is not an empty directory.
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git fetch
+remote: Enumerating objects: 7, done.
+remote: Counting objects: 100% (7/7), done.
+remote: Compressing objects: 100% (3/3), done.
+remote: Total 4 (delta 2), reused 0 (delta 0), pack-reused 0
+Unpacking objects: 100% (4/4), 382 bytes | 54.00 KiB/s, done.
+From uit.mpei.ru:SukhotinMD/cs-lab02
+   2917583..62e345e  main       -> origin/main
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git status
+On branch main
+Your branch is behind 'origin/main' by 1 commit, and can be fast-forwarded.
+  (use "git pull" to update your local branch)
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+        .vs/
+        ARM64/
+        project/ARM64/
+        project/project.vcxproj
+        project/project.vcxproj.filters
+        project/project.vcxproj.user
+
+nothing added to commit but untracked files present (use "git add" to track)
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git log --oneline --decorate --all --graph
+* 62e345e (origin/main, origin/HEAD) code: Добавлено произведение Bob
+* 2917583 (HEAD -> main) build: Внесение файла проекта под git
+* 2b3d2ab build: gitignore
+* 0fd5b86 code: Сумма и разность по заготовке
+* 9568ca1 code: Добавлена вывод суммы в код
+* 478e763 code: Добавление кода из описания лабы
+* 6bb59ae code: заготовка программы
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git pull --ff-only
+Updating 2917583..62e345e
+Fast-forward
+ project/project.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git status
+On branch main
+Your branch is up to date with 'origin/main'.
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+        .vs/
+        ARM64/
+        project/ARM64/
+        project/project.vcxproj
+        project/project.vcxproj.filters
+        project/project.vcxproj.user
+
+nothing added to commit but untracked files present (use "git add" to track)
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git status
+On branch main
+Your branch is up to date with 'origin/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:   project/project.cpp
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+        .vs/
+        ARM64/
+        project/ARM64/
+        project/project.vcxproj
+        project/project.vcxproj.filters
+        project/project.vcxproj.user
+
+no changes added to commit (use "git add" and/or "git commit -a")
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git add project/project.cpp
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git commit -m "code: Добавлено деление"
+[main 44e7f89] code: Добавлено деление
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git push
+Enumerating objects: 7, done.
+Counting objects: 100% (7/7), done.
+Delta compression using up to 4 threads
+Compressing objects: 100% (3/3), done.
+Writing objects: 100% (4/4), 391 bytes | 391.00 KiB/s, done.
+Total 4 (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:SukhotinMD/cs-lab02.git
+   62e345e..44e7f89  main -> main
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git log --oneline --graph --decorate
+* 44e7f89 (HEAD -> main, origin/main, origin/HEAD) code: Добавлено деление
+* 62e345e code: Добавлено произведение Bob
+* 2917583 build: Внесение файла проекта под git
+* 2b3d2ab build: gitignore
+* 0fd5b86 code: Сумма и разность по заготовке
+* 9568ca1 code: Добавлена вывод суммы в код
+* 478e763 code: Добавление кода из описания лабы
+* 6bb59ae code: заготовка программы
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git pull --ff-only
+Already up to date.
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git log --oneline --graph --decorate
+* 44e7f89 (HEAD -> main, origin/main, origin/HEAD) code: Добавлено деление
+* 62e345e code: Добавлено произведение Bob
+* 2917583 build: Внесение файла проекта под git
+* 2b3d2ab build: gitignore
+* 0fd5b86 code: Сумма и разность по заготовке
+* 9568ca1 code: Добавлена вывод суммы в код
+* 478e763 code: Добавление кода из описания лабы
+* 6bb59ae code: заготовка программы
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git push
+Everything up-to-date
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git branch
+* main
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ ^C
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git stauts
+git: 'stauts' is not a git command. See 'git --help'.
+
+The most similar command is
+        status
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git status
+On branch main
+Your branch is up to date with 'origin/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:   project/project.cpp
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+        .vs/
+        ARM64/
+        project/ARM64/
+        project/project.vcxproj
+        project/project.vcxproj.filters
+        project/project.vcxproj.user
+
+no changes added to commit (use "git add" and/or "git commit -a")
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git add project/project.cpp
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git commit -m "code: Конфликт max Alice"
+[main 1b2b2d6] code: Конфликт max Alice
+ 1 file changed, 1 insertion(+)
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git push
+Enumerating objects: 7, done.
+Counting objects: 100% (7/7), done.
+Delta compression using up to 4 threads
+Compressing objects: 100% (3/3), done.
+Writing objects: 100% (4/4), 398 bytes | 398.00 KiB/s, done.
+Total 4 (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:SukhotinMD/cs-lab02.git
+   44e7f89..1b2b2d6  main -> main
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git branch double
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git checkout double
+Switched to branch 'double'
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (double)
+$ git status
+On branch double
+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:   project/project.cpp
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+        .vs/
+        ARM64/
+        project/ARM64/
+        project/project.vcxproj
+        project/project.vcxproj.filters
+        project/project.vcxproj.user
+
+no changes added to commit (use "git add" and/or "git commit -a")
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (double)
+$ git add project/project.cpp
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (double)
+$ git commit -m "code: Вещественный тип данных"
+[double c5f278b] code: Вещественный тип данных
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (double)
+$ git checkout main
+Switched to branch 'main'
+Your branch is up to date with 'origin/main'.
+g
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git pull
+remote: Enumerating objects: 7, done.
+remote: Counting objects: 100% (7/7), done.
+remote: Compressing objects: 100% (3/3), done.
+remote: Total 4 (delta 2), reused 0 (delta 0), pack-reused 0
+Unpacking objects: 100% (4/4), 385 bytes | 38.00 KiB/s, done.
+From uit.mpei.ru:SukhotinMD/cs-lab02
+   1b2b2d6..fbecc7c  main       -> origin/main
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Auto-merging project/project.cpp
+Merge made by the 'ort' strategy.
+ project/project.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git status
+On branch main
+Your branch is ahead of 'origin/main' by 2 commits.
+  (use "git push" to publish your local commits)
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+        .vs/
+        ARM64/
+        project/ARM64/
+        project/project.vcxproj
+        project/project.vcxproj.filters
+        project/project.vcxproj.user
+
+nothing added to commit but untracked files present (use "git add" to track)
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ got log --graph --oneline --decorate --all
+bash: got: command not found
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git log --graph --oneline --decorate --all
+*   f7dea2f (HEAD -> main) Merge branch 'double'
+|\
+| * c5f278b (double) code: Вещественный тип данных
+* | fbecc7c (origin/main, origin/HEAD) code: Конфликт min Bob
+|/
+* 1b2b2d6 code: Конфликт max Alice
+* 44e7f89 code: Добавлено деление
+* 62e345e code: Добавлено произведение Bob
+* 2917583 build: Внесение файла проекта под git
+* 2b3d2ab build: gitignore
+* 0fd5b86 code: Сумма и разность по заготовке
+* 9568ca1 code: Добавлена вывод суммы в код
+* 478e763 code: Добавление кода из описания лабы
+* 6bb59ae code: заготовка программы
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$ git push
+Enumerating objects: 14, done.
+Counting objects: 100% (14/14), done.
+Delta compression using up to 4 threads
+Compressing objects: 100% (6/6), done.
+Writing objects: 100% (8/8), 758 bytes | 379.00 KiB/s, done.
+Total 8 (delta 4), reused 0 (delta 0), pack-reused 0 (from 0)
+remote: . Processing 1 references
+remote: Processed 1 references in total
+To uit.mpei.ru:SukhotinMD/cs-lab02.git
+   fbecc7c..f7dea2f  main -> main
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/alice/project (main)
+$
diff --git a/git poor BOB b/git poor BOB
new file mode 100644
index 0000000..ddd790d
--- /dev/null
+++ b/git poor BOB	
@@ -0,0 +1,458 @@
+
+user@MICHAELD032 CLANGARM64 /
+$ cd ..
+
+user@MICHAELD032 CLANGARM64 /
+$ cd ..
+
+user@MICHAELD032 CLANGARM64 /
+$ cd ..
+
+user@MICHAELD032 CLANGARM64 /
+$ cd
+LICENSE.txt        dev/               mingw64/           unins000.exe
+ReleaseNotes.html  etc/               proc/              unins000.msg
+bin/               git-bash.exe       tmp/               usr/
+cmd/               git-cmd.exe        unins000.dat
+
+user@MICHAELD032 CLANGARM64 /
+$ cd ..
+
+user@MICHAELD032 CLANGARM64 /
+$ cd .. ~/source
+bash: cd: too many arguments
+
+user@MICHAELD032 CLANGARM64 /
+$ cd ~/source
+
+user@MICHAELD032 CLANGARM64 ~/source
+$ cd repos/
+
+user@MICHAELD032 CLANGARM64 ~/source/repos
+$ cd lab02/
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02
+$ cd bob
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob
+$ git git clone git@uit.mpei.ru:SukhotinMD/cs-lab02.git project
+git: 'git' is not a git command. See 'git --help'.
+
+The most similar command is
+        init
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob
+$ git clone git@uit.mpei.ru:SukhotinMD/cs-lab02.git project
+Cloning into 'project'...
+Enter passphrase for key '/c/Users/user/.ssh/id_ed25519':
+remote: Enumerating objects: 22, done.
+remote: Counting objects: 100% (22/22), done.
+remote: Compressing objects: 100% (13/13), done.
+remote: Total 22 (delta 3), reused 0 (delta 0), pack-reused 0
+Receiving objects: 100% (22/22), done.
+Resolving deltas: 100% (3/3), done.
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob
+$ cd project/
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main)
+$ git config.name('Bob (SukhotinMD)')
+bash: syntax error near unexpected token `('
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main)
+$ git config.name 'Bob (SukhotinMD)'
+git: 'config.name' is not a git command. See 'git --help'.
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main)
+$ git config user.name 'Bob (SukhotinMD)'
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main)
+$ git config user.email 'SukhotinMD@mpei.ru'
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main)
+$ git status
+On branch main
+Your branch is up to date with 'origin/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:   project/project.cpp
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+        project/.vs/
+
+no changes added to commit (use "git add" and/or "git commit -a")
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main)
+$ git add project/project.cpp
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main)
+$ git commit "code: Добавлено произведение Bob"
+error: pathspec 'code: Добавлено произведение Bob' did not match any file(s) known to git
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main)
+$ git commit -m "code: Добавлено произведение Bob"
+[main 62e345e] code: Добавлено произведение Bob
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main)
+$ git push
+Enter passphrase for key '/c/Users/user/.ssh/id_ed25519':
+Enter passphrase for key '/c/Users/user/.ssh/id_ed25519':
+Enumerating objects: 7, done.
+Counting objects: 100% (7/7), done.
+Delta compression using up to 4 threads
+Compressing objects: 100% (3/3), done.
+Writing objects: 100% (4/4), 402 bytes | 201.00 KiB/s, done.
+Total 4 (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:SukhotinMD/cs-lab02.git
+   2917583..62e345e  main -> main
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main)
+$ git fetch
+Enter passphrase for key '/c/Users/user/.ssh/id_ed25519':
+remote: Enumerating objects: 7, done.
+remote: Counting objects: 100% (7/7), done.
+remote: Compressing objects: 100% (3/3), done.
+remote: Total 4 (delta 2), reused 0 (delta 0), pack-reused 0
+Unpacking objects: 100% (4/4), 371 bytes | 53.00 KiB/s, done.
+From uit.mpei.ru:SukhotinMD/cs-lab02
+   62e345e..44e7f89  main       -> origin/main
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main)
+$ git status
+On branch main
+Your branch is behind 'origin/main' by 1 commit, and can be fast-forwarded.
+  (use "git pull" to update your local branch)
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+        project/.vs/
+
+nothing added to commit but untracked files present (use "git add" to track)
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main)
+$ git log --oneline --graph --decorate
+* 62e345e (HEAD -> main) code: Добавлено произведение Bob
+* 2917583 build: Внесение файла проекта под git
+* 2b3d2ab build: gitignore
+* 0fd5b86 code: Сумма и разность по заготовке
+* 9568ca1 code: Добавлена вывод суммы в код
+* 478e763 code: Добавление кода из описания лабы
+* 6bb59ae code: заготовка программы
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main)
+$ git fetch
+Enter passphrase for key '/c/Users/user/.ssh/id_ed25519':
+Enter passphrase for key '/c/Users/user/.ssh/id_ed25519':
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main)
+$ git log --oneline --graph --decorate
+* 62e345e (HEAD -> main) code: Добавлено произведение Bob
+* 2917583 build: Внесение файла проекта под git
+* 2b3d2ab build: gitignore
+* 0fd5b86 code: Сумма и разность по заготовке
+* 9568ca1 code: Добавлена вывод суммы в код
+* 478e763 code: Добавление кода из описания лабы
+* 6bb59ae code: заготовка программы
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main)
+$ git fetch
+Enter passphrase for key '/c/Users/user/.ssh/id_ed25519':
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main)
+$ git log --oneline --graph --decorate
+* 62e345e (HEAD -> main) code: Добавлено произведение Bob
+* 2917583 build: Внесение файла проекта под git
+* 2b3d2ab build: gitignore
+* 0fd5b86 code: Сумма и разность по заготовке
+* 9568ca1 code: Добавлена вывод суммы в код
+* 478e763 code: Добавление кода из описания лабы
+* 6bb59ae code: заготовка программы
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main)
+$ git branch
+* main
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main)
+$ git fetch
+Enter passphrase for key '/c/Users/user/.ssh/id_ed25519':
+Enter passphrase for key '/c/Users/user/.ssh/id_ed25519':
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main)
+$ git log --oneline --graph --decorate
+* 62e345e (HEAD -> main) code: Добавлено произведение Bob
+* 2917583 build: Внесение файла проекта под git
+* 2b3d2ab build: gitignore
+* 0fd5b86 code: Сумма и разность по заготовке
+* 9568ca1 code: Добавлена вывод суммы в код
+* 478e763 code: Добавление кода из описания лабы
+* 6bb59ae code: заготовка программы
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main)
+$ git show 44e7f89
+commit 44e7f89676892fee76ba7810cefb00878c4b3c26 (origin/main, origin/HEAD)
+Author: Alice (SukhotinMD) <SukhotinMD@mpei.ru>
+Date:   Mon Mar 24 15:57:36 2025 +0300
+
+    code: Добавлено деление
+
+diff --git a/project/project.cpp b/project/project.cpp
+index e9ac1c7..0672f4f 100644
+--- a/project/project.cpp
++++ b/project/project.cpp
+@@ -11,7 +11,8 @@ int main()
+     cin >> a >> b;
+     cout << "A + B = " << a + b << '\n'
+          << "A - B = " << a - b << '\n'
+-         << "A * B = " << a * b << '\n';
++         << "A * B = " << a * b << '\n'
++         << "A / B = " << a / b << '\n';
+
+
+
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main)
+$ git log --oneline --graph --decorate --all
+* 44e7f89 (origin/main, origin/HEAD) code: Добавлено деление
+* 62e345e (HEAD -> main) code: Добавлено произведение Bob
+* 2917583 build: Внесение файла проекта под git
+* 2b3d2ab build: gitignore
+* 0fd5b86 code: Сумма и разность по заготовке
+* 9568ca1 code: Добавлена вывод суммы в код
+* 478e763 code: Добавление кода из описания лабы
+* 6bb59ae code: заготовка программы
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main)
+$ git pull --ff-only
+Enter passphrase for key '/c/Users/user/.ssh/id_ed25519':
+Updating 62e345e..44e7f89
+Fast-forward
+ project/project.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main)
+$ git log --oneline --graph --decorate --all
+* 44e7f89 (HEAD -> main, origin/main, origin/HEAD) code: Добавлено деление
+* 62e345e code: Добавлено произведение Bob
+* 2917583 build: Внесение файла проекта под git
+* 2b3d2ab build: gitignore
+* 0fd5b86 code: Сумма и разность по заготовке
+* 9568ca1 code: Добавлена вывод суммы в код
+* 478e763 code: Добавление кода из описания лабы
+* 6bb59ae code: заготовка программы
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main)
+$ git status
+On branch main
+Your branch is up to date with 'origin/main'.
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+        project/.vs/
+
+nothing added to commit but untracked files present (use "git add" to track)
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main)
+$ git status
+On branch main
+Your branch is up to date with 'origin/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:   project/project.cpp
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+        .vs/
+        project/.vs/
+
+no changes added to commit (use "git add" and/or "git commit -a")
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main)
+$ git add project/project.cpp
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main)
+$ git commit -m "code: Конфликт min Bob"
+[main 3fd2d34] code: Конфликт min Bob
+ 1 file changed, 1 insertion(+)
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main)
+$ git push
+Enter passphrase for key '/c/Users/user/.ssh/id_ed25519':
+To uit.mpei.ru:SukhotinMD/cs-lab02.git
+ ! [rejected]        main -> main (fetch first)
+error: failed to push some refs to 'uit.mpei.ru:SukhotinMD/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.
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main)
+$ git pull
+Enter passphrase for key '/c/Users/user/.ssh/id_ed25519':
+remote: Enumerating objects: 7, done.
+remote: Counting objects: 100% (7/7), done.
+remote: Compressing objects: 100% (3/3), done.
+remote: Total 4 (delta 2), reused 0 (delta 0), pack-reused 0
+Unpacking objects: 100% (4/4), 378 bytes | 34.00 KiB/s, done.
+From uit.mpei.ru:SukhotinMD/cs-lab02
+   44e7f89..1b2b2d6  main       -> origin/main
+Auto-merging project/project.cpp
+CONFLICT (content): Merge conflict in project/project.cpp
+Automatic merge failed; fix conflicts and then commit the result.
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main|MERGING)
+$ git log --oneline --decorate --all --graph
+* 3fd2d34 (HEAD -> main) code: Конфликт min Bob
+| * 1b2b2d6 (origin/main, origin/HEAD) code: Конфликт max Alice
+|/
+* 44e7f89 code: Добавлено деление
+* 62e345e code: Добавлено произведение Bob
+* 2917583 build: Внесение файла проекта под git
+* 2b3d2ab build: gitignore
+* 0fd5b86 code: Сумма и разность по заготовке
+* 9568ca1 code: Добавлена вывод суммы в код
+* 478e763 code: Добавление кода из описания лабы
+* 6bb59ae code: заготовка программы
+
+//Разрешение конфликтов правок при совместной работе
+
+
+
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main|MERGING)
+$ git rebase origin/main
+project/project.cpp: needs merge
+error: cannot rebase: You have unstaged changes.
+error: additionally, your index contains uncommitted changes.
+error: Please commit or stash them.
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main|MERGING)
+$ git status
+On branch main
+Your branch and 'origin/main' have diverged,
+and have 1 and 1 different commits each, respectively.
+  (use "git pull" if you want to integrate the remote branch with yours)
+
+You have unmerged paths.
+  (fix conflicts and run "git commit")
+  (use "git merge --abort" to abort the merge)
+
+Unmerged paths:
+  (use "git add <file>..." to mark resolution)
+        both modified:   project/project.cpp
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+        .vs/
+        project/.vs/
+
+no changes added to commit (use "git add" and/or "git commit -a")
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main|MERGING)
+$ git add project/project.cpp
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main|MERGING)
+$ git rebase --continue
+fatal: no rebase in progress
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main|MERGING)
+$ git rebase orogin/main
+fatal: invalid upstream 'orogin/main'
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main|MERGING)
+$ git rebase origin/main
+error: cannot rebase: Your index contains uncommitted changes.
+error: Please commit or stash them.
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main|MERGING)
+$ git commit -m "code: Конфликт 2 min max Bob"
+[main e280498] code: Конфликт 2 min max Bob
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main)
+$ git rebase origin/main
+Auto-merging project/project.cpp
+CONFLICT (content): Merge conflict in project/project.cpp
+error: could not apply 3fd2d34... code: Конфликт min Bob
+hint: Resolve all conflicts manually, mark them as resolved with
+hint: "git add/rm <conflicted_files>", 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".
+hint: Disable this message with "git config set advice.mergeConflict false"
+Could not apply 3fd2d34... code: Конфликт min Bob
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main|REBASE 1/1)
+$ git rebase --continue
+project/project.cpp: needs merge
+You must edit all merge conflicts and then
+mark them as resolved using git add
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main|REBASE 1/1)
+$ git status
+interactive rebase in progress; onto 1b2b2d6
+Last command done (1 command done):
+   pick 3fd2d34 code: Конфликт min Bob
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+[detached HEAD fbecc7c] code: Конфликт min Bob
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+Successfully rebased and updated refs/heads/main.
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main)
+$ git log --oneline --graph --all --decorate
+* fbecc7c (HEAD -> main) code: Конфликт min Bob
+* 1b2b2d6 (origin/main, origin/HEAD) code: Конфликт max Alice
+* 44e7f89 code: Добавлено деление
+* 62e345e code: Добавлено произведение Bob
+* 2917583 build: Внесение файла проекта под git
+* 2b3d2ab build: gitignore
+* 0fd5b86 code: Сумма и разность по заготовке
+* 9568ca1 code: Добавлена вывод суммы в код
+* 478e763 code: Добавление кода из описания лабы
+* 6bb59ae code: заготовка программы
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main)
+$ git push
+Enter passphrase for key '/c/Users/user/.ssh/id_ed25519':
+Enter passphrase for key '/c/Users/user/.ssh/id_ed25519':
+Enumerating objects: 7, done.
+Counting objects: 100% (7/7), done.
+Delta compression using up to 4 threads
+Compressing objects: 100% (3/3), done.
+Writing objects: 100% (4/4), 405 bytes | 405.00 KiB/s, done.
+Total 4 (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:SukhotinMD/cs-lab02.git
+   1b2b2d6..fbecc7c  main -> main
+
+user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main)
+$