From fae9976bddb9df91dc0335cdd94b7292a07a15dc Mon Sep 17 00:00:00 2001
From: TiutinMO <tiutinmo@mpei.ru>
Date: Mon, 5 May 2025 10:49:10 +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

---
 otchetMO.txt | 1012 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 1012 insertions(+)
 create mode 100644 otchetMO.txt

diff --git a/otchetMO.txt b/otchetMO.txt
new file mode 100644
index 0000000..563a42a
--- /dev/null
+++ b/otchetMO.txt
@@ -0,0 +1,1012 @@
+1. Вход в терминал и создание структуры каталогов
+	-Создание папки с названием «Лаба_2» на рабочем столе
+	-Запуск Git Bash
+	-Просмотр файлов в каталоге с помощью команды ls 
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02
+$ ls
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02
+$
+
+
+	-Создание папок «lab02/alice» и «lab02/bob»
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02
+$ mkdir alice
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02
+$ mkdir bob
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02
+$
+
+	-Переход на «компьютер Алисы» 
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02
+$ cd alice
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice
+$
+
+
+	-Создание каталога project и переход к нему
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice
+$ mkdir project
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice
+$ cd project
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project
+$
+	-Переход из каталога вверх
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project
+$ cd ..
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice
+$
+
+	-Переход обратно к project
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice
+$ cd project
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project
+$
+
+
+2. Инициализация репозитария и настройка Git
+	-Инициализация репозитария в текущем каталоге (project)
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project
+$ git init
+Initialized empty Git repository in C:/Users/mainm/Desktop/lab02/alice/project/.git/
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (master)
+$
+
+
+	-Переименование ветки в main
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (master)
+$ git branch -m main
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$
+
+
+	-Настройка репозитория Алисы
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$ git config user.name "Alice (TiutinMO)"
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$ git config user.email "TiutinMO@mpei.ru"
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$
+
+
+3. Создание комитов
+	-Создание проекта в репозитории Алисы
+4. Занесение файлов под контроль версий
+	-Просмотр состояния рабочей копии
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/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)
+        main.cpp
+        project.cbp
+
+nothing added to commit but untracked files present (use "git add" to track)
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$
+
+
+	- Добавление файла main.cpp
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$ git add main.cpp
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$
+
+
+	- Проверка состояния рабочей копии
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$ git status
+On branch main
+
+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)
+        project.cbp
+
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$
+
+
+	-Выполнение комита с файлом main.cpp
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$ git commit -m 'code: заготовка программы'
+[main (root-commit) 9f5a78d] code: заготовка программы
+ 1 file changed, 9 insertions(+)
+ create mode 100644 main.cpp
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$
+
+
+5. Составление сообщений к комитам
+	-Добавление project.cbp в индекс
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/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
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$
+
+
+	-Проверка состояния рабочей копии
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$ git status
+On branch main
+Changes to be committed:
+  (use "git restore --staged <file>..." to unstage)
+        new file:   project.cbp
+
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$
+
+
+	-Создание комита с project.cbp
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$ git commit -m 'build: добавлен файл проекта'
+[main 409a224] build: добавлен файл проекта
+ 1 file changed, 40 insertions(+)
+ create mode 100644 project.cbp
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$
+
+
+6. Создание комитов с изменениями
+	-Изменение файла main.cpp
+	-Проверка состояния рабочей копии
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/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
+
+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")
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$
+
+
+	-Добавление файла main.cpp с изменениями
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$ git add main.cpp
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$ git commit -m 'code: ввод двух чисел'
+[main 9202f13] code: ввод двух чисел
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$
+
+
+	-Добаавление вывода суммы в main.cpp
+	-Добавление всех изменённых файлов (main.cpp)
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$ git add -u
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$ git commit -m 'code: вывод суммы'
+[main 435bc5c] code: вывод суммы
+ 1 file changed, 1 insertion(+)
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$
+
+
+	-Добавление вывода разности
+	-Создание комита с изменённым main.cpp
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$ git commit -a -m 'code: вывод разности'
+[main 87cb34b] code: вывод разности
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$
+
+
+7. Игнорирование файлов
+	-создание файла .gitignore
+	-проверка состояния рабочей копии
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/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)
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$
+
+
+	-добавление в .gitignore /obj *.layout
+	-добавления файла .gitignore
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$ git add .gitignore
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$ git commit -m 'git: игнорирование'
+[main 94781c7] git: игнорирование
+ 1 file changed, 3 insertions(+)
+ create mode 100644 .gitignore
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$
+
+
+8. Просмотр истории
+1) Работа с журналом
+	-ввод команды git log
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$ git log --stat
+commit 94781c7f25e10e0c50b59b3cc809118f68643561 (HEAD -> main)
+Author: Alice (TiutinMO) <TiutinMO@mpei.ru>
+Date:   Mon May 5 01:00:50 2025 +0300
+
+    git: игнорирование
+
+ .gitignore | 3 +++
+ 1 file changed, 3 insertions(+)
+
+commit 87cb34b551190778610f780083fa068b9be73e7d
+Author: Alice (TiutinMO) <TiutinMO@mpei.ru>
+Date:   Mon May 5 00:59:06 2025 +0300
+
+    code: вывод разности
+
+ main.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit 435bc5c41ec905079e5165c384ade1b1927c8e62
+Author: Alice (TiutinMO) <TiutinMO@mpei.ru>
+Date:   Mon May 5 00:58:12 2025 +0300
+
+    code: вывод суммы
+
+
+
+	-коммиты по теме build
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$ git log --grep "build: "
+commit 409a22487130581b067837a3538982f1a5082ec1
+Author: Alice (TiutinMO) <TiutinMO@mpei.ru>
+Date:   Mon May 5 00:55:25 2025 +0300
+
+    build: добавлен файл проекта
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$
+
+
+	-коммиты касающиеся project.cbp
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$ git log project.cbp
+commit 409a22487130581b067837a3538982f1a5082ec1
+Author: Alice (TiutinMO) <TiutinMO@mpei.ru>
+Date:   Mon May 5 00:55:25 2025 +0300
+
+    build: добавлен файл проекта
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$
+
+
+2) Просмотр коммитов
+	-Просмотр предпоследнего коммита
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$ git show HEAD~1
+commit 87cb34b551190778610f780083fa068b9be73e7d
+Author: Alice (TiutinMO) <TiutinMO@mpei.ru>
+Date:   Mon May 5 00:59:06 2025 +0300
+
+    code: вывод разности
+
+diff --git a/main.cpp b/main.cpp
+index 6de6dd2..5371b30 100644
+--- a/main.cpp
++++ b/main.cpp
+@@ -7,6 +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';
+     return 0;
+ }
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$
+
+
+3) Просмотр изменений
+	-Добавление печать печать произведения чисел в main.cpp
+	-git diff
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$ git diff
+diff --git a/main.cpp b/main.cpp
+index 5371b30..fbd9488 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';
+     return 0;
+ }
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$
+
+
+	-Просмотр изменений между 1-м коммитом и коммитом вывода разности
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$ git diff 87cb34b 9f5a78d
+diff --git a/main.cpp b/main.cpp
+index 5371b30..b4392ec 100644
+--- a/main.cpp
++++ b/main.cpp
+@@ -4,10 +4,6 @@ using namespace std;
+
+ int main()
+ {
+-    cout << "Enter A and B: ";
+-    int a, b;
+-    cin >> a >> b;
+-    cout << "A + B = " << a + b << '\n'
+-         << "A - B = " << a - b << '\n';
++    cout << "Hello world!" << endl;
+     return 0;
+ }
+diff --git a/project.cbp b/project.cbp
+deleted file mode 100644
+index 99bb702..0000000
+--- a/project.cbp
++++ /dev/null
+@@ -1,40 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$
+
+
+9. Откат изменений
+	-Создание коммита с изменённым main.cpp
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$ git add main.cpp
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$ git commit -m 'code: вывод произведения'
+[main 836deec] code: вывод произведения
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$
+
+
+	-откат рабочей копии на комит назад
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$ git reset --hard HEAD~1
+HEAD is now at 94781c7 git: игнорирование
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$
+
+
+	-Добавляем комментарий в main.cpp
+	-Откатываем файл к состоянию в последнем коммите
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$ git checkout HEAD -- main.cpp
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$
+
+
+10. Обмен кодом через удаленное хранилище
+	-Создание ключей
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$ ssh-keygen
+Generating public/private ed25519 key pair.
+Enter file in which to save the key (/c/Users/mainm/.ssh/id_ed25519):
+Created directory '/c/Users/mainm/.ssh'.
+Enter passphrase for "/c/Users/mainm/.ssh/id_ed25519" (empty for no passphrase):
+Enter same passphrase again:
+Your identification has been saved in /c/Users/mainm/.ssh/id_ed25519
+Your public key has been saved in /c/Users/mainm/.ssh/id_ed25519.pub
+The key fingerprint is:
+SHA256:AUoYtiQyvB+05XcFEmdxpNLvq6Aj/o1Q53WoIsfwVOY mainm@DESKTOP-FOCK1J4
+The key's randomart image is:
++--[ED25519 256]--+
+|= +o. .o.=+o     |
+|.*.+ o .= o.     |
+|  + =  +.o.      |
+| . o .+..oo      |
+|  ...o.ESo o     |
+|   .* o o o      |
+|   o = +   .     |
+|   .+.= .   .    |
+|  ..o+.. ...     |
++----[SHA256]-----+
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$
+
+
+	-запуск агента
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$ eval $(ssh-agent -s)
+Agent pid 1679
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$
+
+
+	-загрузка ключей
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$ ssh-add
+Identity added: /c/Users/mainm/.ssh/id_ed25519 (mainm@DESKTOP-FOCK1J4)
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$
+
+
+	-отбражение открытого ключа
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$ cat ~/.ssh/id_ed25519.pub
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO9M2KuZBE3rOqSUoQSimt+d4BLFfbFmG1/u9HkKfF/G mainm@DESKTOP-FOCK1J4
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$
+
+
+10. Отправка проекта на сервер
+	-Создание репозитория
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$ git remote add origin http://uit.mpei.ru/git/TiutinMO/cs-lab02.git
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$ git push -u origin main
+warning: use of unencrypted HTTP remote URLs is not recommended; see https://aka.ms/gcm/unsaferemotes for more information.
+Enumerating objects: 18, done.
+Counting objects: 100% (18/18), done.
+Delta compression using up to 16 threads
+Compressing objects: 100% (16/16), done.
+Writing objects: 100% (18/18), 2.30 KiB | 470.00 KiB/s, done.
+Total 18 (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/TiutinMO/cs-lab02.git
+ * [new branch]      main -> main
+branch 'main' set up to track 'origin/main'.
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$
+
+
+11. Получение проекта с сервера
+	-Клонирование проекта
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/bob
+$ git clone http://uit.mpei.ru/git/TiutinMO/cs-lab02.git project
+Cloning into 'project'...
+remote: Enumerating objects: 18, done.
+remote: Counting objects: 100% (18/18), done.
+remote: Compressing objects: 100% (16/16), done.
+remote: Total 18 (delta 2), reused 0 (delta 0), pack-reused 0
+Receiving objects: 100% (18/18), done.
+Resolving deltas: 100% (2/2), done.
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/bob
+$
+
+
+	-настройка Git
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/bob/project (main)
+$ git config user.name "bob (TiutinMO)"
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/bob/project (main)
+$ git config user.email "TiutinMO@mpei.ru"
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/bob/project (main)
+$
+
+
+12. Совместная работа над проектом без конфликтов правок
+	-Добавление вывода произведения чисел
+	-Создание коммита вывода произведения Бобом
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/bob/project (main)
+$ git commit -m 'code: вывод произведения'
+[main 8a0cd9e] code: вывод произведения
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/bob/project (main)
+$
+
+
+	-Отправка коммита на сервер
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/bob/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), 400 bytes | 400.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/TiutinMO/cs-lab02.git
+   94781c7..8a0cd9e  main -> main
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/bob/project (main)
+$
+
+
+	-Загрузка изменений в машину Алисы
+mainm@DESKTOP-FOCK1J4 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), 380 bytes | 31.00 KiB/s, done.
+From http://uit.mpei.ru/git/TiutinMO/cs-lab02
+   94781c7..8a0cd9e  main       -> origin/main
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$
+
+	-Просмотр истории всех веток
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$ git log --oneline --decorate --all --graph
+* 8a0cd9e (origin/main, origin/HEAD) code: вывод произведения
+* 94781c7 (HEAD -> main) git: игнорирование
+* 87cb34b code: вывод разности
+* 435bc5c code: вывод суммы
+* 9202f13 code: ввод двух чисел
+* 409a224 build: добавлен файл проекта
+* 9f5a78d code: заготовка программы
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$
+
+
+	-Продвижение ветки main
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$ git pull --ff-only
+Updating 94781c7..8a0cd9e
+Fast-forward
+ main.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$
+
+
+	-Создание коммита с выводом частного
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$ git add main.cpp
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$ git commit -m 'code: вывод частного'
+[main 4b1d9fc] code: вывод частного
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$
+
+
+	-отправка комита
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/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), 418 bytes | 418.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/TiutinMO/cs-lab02.git
+   8a0cd9e..4b1d9fc  main -> main
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$
+
+
+	-Загрузка изменений Бобу
+
+mainm@DESKTOP-FOCK1J4 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), 398 bytes | 17.00 KiB/s, done.
+From http://uit.mpei.ru/git/TiutinMO/cs-lab02
+   8a0cd9e..4b1d9fc  main       -> origin/main
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/bob/project (main)
+$
+
+
+	-передвижение ветки
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/bob/project (main)
+$ git pull --ff-only
+Updating 8a0cd9e..4b1d9fc
+Fast-forward
+ main.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/bob/project (main)
+$
+
+
+13. Разрешение конфликтов правок при совместной работе
+	-переделка кода в НАДЛЕЖАЩИЙ вид
+
+	-создание коммита с выводом максимума и его отправка
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$ git add main.cpp
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$ git commit -m 'code: вывод максимума'
+[main 68a6ef4] code: вывод максимума
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/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), 408 bytes | 408.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/TiutinMO/cs-lab02.git
+   4b1d9fc..68a6ef4  main -> main
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$
+
+
+	-создание коммита с выводом минимума
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/bob/project (main)
+$ git add main.cpp
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/bob/project (main)
+$ git commit -m 'code: вывод минимума'
+[main eac7fe3] code: вывод минимума
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/bob/project (main)
+$
+
+
+	-Попытка отправки
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/bob/project (main)
+$ git push
+To http://uit.mpei.ru/git/TiutinMO/cs-lab02.git
+ ! [rejected]        main -> main (fetch first)
+error: failed to push some refs to 'http://uit.mpei.ru/git/TiutinMO/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.
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/bob/project (main)
+$
+
+
+	-загрузка изменений и 
+mainm@DESKTOP-FOCK1J4 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), 388 bytes | 5.00 KiB/s, done.
+From http://uit.mpei.ru/git/TiutinMO/cs-lab02
+   4b1d9fc..68a6ef4  main       -> origin/main
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/bob/project (main)
+$
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/bob/project (main)
+$ git log --oneline --decorate --all --graph
+* eac7fe3 (HEAD -> main) code: вывод минимума
+| * 68a6ef4 (origin/main, origin/HEAD) code: вывод максимума
+|/
+* 4b1d9fc code: вывод частного
+* 8a0cd9e code: вывод произведения
+* 94781c7 git: игнорирование
+* 87cb34b code: вывод разности
+* 435bc5c code: вывод суммы
+* 9202f13 code: ввод двух чисел
+* 409a224 build: добавлен файл проекта
+* 9f5a78d code: заготовка программы
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/bob/project (main)
+$
+
+
+	-Применение rebase
+
+mainm@DESKTOP-FOCK1J4 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 eac7fe3... code: вывод минимума
+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 eac7fe3... code: вывод минимума
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/bob/project (main|REBASE 1/1)
+$
+
+
+	-Продолжение rebase
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/bob/project (main|REBASE 1/1)
+$ git add main.cpp
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/bob/project (main)
+$ git rebase --continue
+Successfully rebased and updated refs/heads/main.
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/bob/project (main)
+$
+
+
+	-проверка истории хранилища
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/bob/project (main)
+$ git log --oneline --decorate --all --graph
+* e490122 (HEAD -> main) code: вывод минимума
+* 68a6ef4 (origin/main, origin/HEAD) code: вывод максимума
+* 4b1d9fc code: вывод частного
+* 8a0cd9e code: вывод произведения
+* 94781c7 git: игнорирование
+* 87cb34b code: вывод разности
+* 435bc5c code: вывод суммы
+* 9202f13 code: ввод двух чисел
+* 409a224 build: добавлен файл проекта
+* 9f5a78d code: заготовка программы
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/bob/project (main)
+$
+
+
+	-синхронизация изменений
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/bob/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), 468 bytes | 468.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/TiutinMO/cs-lab02.git
+   68a6ef4..e490122  main -> main
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/bob/project (main)
+$
+
+
+14. Использование веток
+	-Создание ветки double и переключение на неё
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$ git branch double
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$ git checkout double
+M       project.cbp
+Switched to branch 'double'
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (double)
+$
+
+
+	-Коммит с изменением типа данных на double
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (double)
+$ git add main.cpp
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (double)
+$ git commit -m 'code: тип double'
+[double 7ef531c] code: тип double
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (double)
+$
+
+
+	-Синхронизация main Алисы с сервером
+
+mainm@DESKTOP-FOCK1J4 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), 448 bytes | 15.00 KiB/s, done.
+From http://uit.mpei.ru/git/TiutinMO/cs-lab02
+   68a6ef4..e490122  main       -> origin/main
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$ git rebase origin/main
+error: cannot rebase: You have unstaged changes.
+error: Please commit or stash them.
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$ git pull --ff-only
+Updating 68a6ef4..e490122
+Fast-forward
+ main.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$ git log --oneline --decorate --all --graph
+* 7ef531c (double) code: тип double
+| * e490122 (HEAD -> main, origin/main, origin/HEAD) code: вывод минимума
+|/
+* 68a6ef4 code: вывод максимума
+* 4b1d9fc code: вывод частного
+* 8a0cd9e code: вывод произведения
+* 94781c7 git: игнорирование
+* 87cb34b code: вывод разности
+* 435bc5c code: вывод суммы
+* 9202f13 code: ввод двух чисел
+* 409a224 build: добавлен файл проекта
+* 9f5a78d code: заготовка программы
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$
+
+	
+	-Слияние веток double и main
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$ git merge double
+fatal: You have not concluded your merge (MERGE_HEAD exists).
+Please, commit your changes before you merge.
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$ git add main.cpp
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$ git commit -m 'code: изменение типа double со слиянием веток'
+[main 74bfe99] code: изменение типа double со слиянием веток
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$
+
+
+	-отправка изменений на сервер
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$ git push
+Enumerating objects: 13, done.
+Counting objects: 100% (13/13), done.
+Delta compression using up to 16 threads
+Compressing objects: 100% (9/9), done.
+Writing objects: 100% (9/9), 1.10 KiB | 564.00 KiB/s, done.
+Total 9 (delta 3), 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/TiutinMO/cs-lab02.git
+   e490122..74bfe99  main -> main
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$
+
+
+	-история всех веток репозитория
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$ git log --oneline --decorate --all --graph
+* 74bfe99 (HEAD -> main, origin/main, origin/HEAD) code: изменение типа double со слиянием веток
+*   8af2c77 Merge branch 'double'
+|\
+| * 7ef531c (double) code: тип double
+* | e490122 code: вывод минимума
+|/
+* 68a6ef4 code: вывод максимума
+* 4b1d9fc code: вывод частного
+* 8a0cd9e code: вывод произведения
+* 94781c7 git: игнорирование
+* 87cb34b code: вывод разности
+* 435bc5c code: вывод суммы
+* 9202f13 code: ввод двух чисел
+* 409a224 build: добавлен файл проекта
+* 9f5a78d code: заготовка программы
+
+mainm@DESKTOP-FOCK1J4 MINGW64 ~/Desktop/lab02/alice/project (main)
+$
\ No newline at end of file