diff --git a/Novy_textovy_dokument.txt b/Novy_textovy_dokument.txt
deleted file mode 100644
index ec3d8e0..0000000
--- a/Novy_textovy_dokument.txt
+++ /dev/null
@@ -1,599 +0,0 @@
-Отчет по лабораторной работе № 2 "Система контроля версий Git"
-
-Выполнил: Мовсисян Р.Г.
-Группа:   А-03-23
-Проверил: 
-
-Примечание: работа выполнялась на Windows.
-
-1. Создал на рабочем столе каталог lab02 и запустил в нем Git Bash, приглашение:
-
-u113-13@PROG-29 MINGW32 ~/Desktop/lab02
-$
-
-
-2. Просмотрел файлы в рабочем каталоге можно командой "ls" --- пусто:
-
-u113-13@PROG-29 MINGW32 ~/Desktop/lab02
-$ ls
-u113-13@PROG-29 MINGW32 ~/Desktop/lab02
-$
-
-
-3. Создал каталоги Алисы и Боба, создал каталог "project",
-изучил команду "cd" в процессе:
-
-u113-13@PROG-29 MINGW32 ~/Desktop/lab02
-$ mkdir alice
-
-u113-13@PROG-29 MINGW32 ~/Desktop/lab02
-$ mkdir bob
-
-u113-13@PROG-29 MINGW32 ~/Desktop/lab02
-$ cd bob
-
-u113-13@PROG-29 MINGW32 ~/Desktop/lab02/bob
-$ cd ..
-
-u113-13@PROG-29 MINGW32 ~/Desktop/lab02
-$ cd alice
-
-u113-13@PROG-29 MINGW32 ~/Desktop/lab02/alice
-$ mkdir project
-
-u113-13@PROG-29 MINGW32 ~/Desktop/lab02/alice
-$ ls
-project
-
-u113-13@PROG-29 MINGW32 ~/Desktop/lab02/alice
-$ cd project
-
-4. Инициализировал репозитарий, Добавил свои данные, переименовать имя ветки не получилось(сделаю после создания) первого коммита
-
-u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (master)
-$ git init
-Reinitialized existing Git repository in C:/Users/u113-13/Desktop/lab02/alice/project/.git/
-
-u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (master)
-$ git branch -m main
-error: refname refs/heads/master not found
-fatal: Branch rename failed
-
-u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (master)
-$ git config user.name 'Alice (MovsisyanRG)'
-
-u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (master)
-$ git config user.email 'MovsisianRG@mpei.ru'
-
-5. Создал проект в репозитарии Алисы
-6. просмотрел состояние рабочей копии 
-$ git status
-On branch master (имя текущей ветви master)
-
-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)
-
-Занёс main.cpp под Git
-
-u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (master)
-$ git add main.cpp
-
-Еще раз просмотрел состояние рабочей копии
-
-$ 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)
-
-        project.cbp
-
-Выполнил коммит с файлом main.cpp
-
-u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (master)
-$ git commit -m 'code: заготовка программы'
-[master (root-commit) 5fdca83] code: заготовка программы
- 1 file changed, 9 insertions(+)
- create mode 100644 main.cpp
-
-7. Добавил файл projcet.cbp в индекс и сделал коммит с ним
-
-$ git add project.cbp
-warning: LF will be replaced by CRLF in project.cbp.
-The file will have its original line endings in your working directory
-
-u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (master)
-$ git commit -m 'build: add project file'
-[master 00a65a5] build: add project file
- 1 file changed, 40 insertions(+)
- create mode 100644 project.cbp
-
-8. Переименовал имя ветки на main (так как до этого не получалось)
-$ git branch -m main
-
-u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (main)
-
-9. Заменил тело функции main() на ввод двух чисел, посмотрел состояние репозитария
-$ git status
-On branch main
-Changes not staged for commit:
-  (use "git add <file>..." to update what will be committed)
-  (use "git checkout -- <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")
-
-u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (main)
-
-Когда изменяется существующй, есть приписка modified:, а при добавлении новых, они идут под отдельное условие untracked file:
-
-Добавил сумму и разность чисел a и b, а так же попробовал 3 способа закоммитить изменения
-u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (main)
-$ git add main.cpp
-
-u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (main)
-$ git commit -m "code: заготовка программы с вводом чисел"
-[main 79d7c57] code: заготовка программы с вводом чисел
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (main)
-$ git add -u
-
-u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (main)
-$ git commit -m "code: добавлена сумма a и b"
-[main dfdb00c] code: добавлена сумма a и b
- 1 file changed, 1 insertion(+)
-
-u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (main)
-$ git commit -a -m "code: добавлена разность a и b"
-[main 84a34f0] code: добавлена разность a и b
- 1 file changed, 1 insertion(+)
-
-u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (main)
-
-10. Создал новый файл .gitignore, добавил его под Git и создал коммит
-u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (main)
-$ git add .gitignore
-
-u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (main)
-$ git commit -m "git: создан файл для игнора каталогов"
-[main ea99681] git: создан файл для игнора каталогов
- 1 file changed, 3 insertions(+)
- create mode 100644 .gitignore
-
-u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (main)
-
-11.Нашел сначала коммиты по теме build, затем коммиты, затрагивающие project.cbp.
-$ git log --grep "build"
-commit 00a65a558b74d187bf374ea9fb4cd040de92c1c1
-Author: Alice (MovsisyanRG) <MovsisianRG@mpei.ru>
-Date:   Wed Mar 27 14:28:14 2024 +0300
-
-    build: add project file
-
-u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (main)
-$ git log -- project.cbp
-commit 00a65a558b74d187bf374ea9fb4cd040de92c1c1
-Author: Alice (MovsisyanRG) <MovsisianRG@mpei.ru>
-Date:   Wed Mar 27 14:28:14 2024 +0300
-
-    build: add project file
-
-u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (main)
-
-12. Прсмотрел предпоследний коммит
-$ git show HEAD~1
-commit 84a34f007082206aa093e8e76408d0c4ed8303df
-Author: Alice (MovsisyanRG) <MovsisianRG@mpei.ru>
-Date:   Wed Mar 27 14:38:36 2024 +0300
-
-    code: aiaaaeaia ?aciinou a e b
-
-diff --git a/main.cpp b/main.cpp
-index 9bfc0db..1c9caca 100644
---- a/main.cpp
-+++ b/main.cpp
-@@ -8,5 +8,6 @@ int main()
-     int a, b;
-     cin >> a >> b;
-     cout << "A + B = " << a + b << '\n'
-+        << "A - B = " << a - b << '\n';
-
- }
-
-13. Просмотрел изменения между самым первым коммитом и коммитом, добавляющим вывод разности.
-$ git diff HEAD~2 HEAD
-diff --git a/.gitignore b/.gitignore
-new file mode 100644
-index 0000000..d85abef
---- /dev/null
-+++ b/.gitignore
-@@ -0,0 +1,3 @@
-+/bin
-+/obj
-+/*.layout
-diff --git a/main.cpp b/main.cpp
-index 9bfc0db..1c9caca 100644
---- a/main.cpp
-+++ b/main.cpp
-@@ -8,5 +8,6 @@ int main()
-     int a, b;
-     cin >> a >> b;
-     cout << "A + B = " << a + b << '\n'
-+        << "A - B = " << a - b << '\n';
-
- }
-
-14. Закоммитил проивзедение, откатил коммит, добавил комент в main и откатил другим способом
-$ git commit -m "code: добавлено произведение a и b"
-On branch main
-Changes not staged for commit:
-        modified:   main.cpp
-        modified:   project.cbp
-
-no changes added to commit
-
-u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (main)
-$ git reset --hard HEAD~1
-HEAD is now at 84a34f0 code: добавлена разность a и b
-
-u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (main)
-$ git checkout HEAD -- main.cpp
-
-u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (main)
-
-15. Создал пару ключей, запустил агент, добавил в список в своей уч записи
-$ ssh-keygen
-Generating public/private rsa key pair.
-Enter file in which to save the key (/c/Users/u113-13/.ssh/id_rsa):
-Created directory '/c/Users/u113-13/.ssh'.
-Enter passphrase (empty for no passphrase):
-Enter same passphrase again:
-Your identification has been saved in /c/Users/u113-13/.ssh/id_rsa.
-Your public key has been saved in /c/Users/u113-13/.ssh/id_rsa.pub.
-The key fingerprint is:
-SHA256:RnKZThnNyOJGC+i68NI+ElEHIsJitMgcBBdX1lB8//g u113-13@PROG-23
-The key's randomart image is:
-+---[RSA 2048]----+
-|X+++..+*o+       |
-|B==.o.o ==+      |
-|+* . +.oB. .     |
-|. .   +*    .    |
-| o   .  S    o   |
-|+      .    . .  |
-|.=           .   |
-|+ +           E  |
-| +..             |
-+----[SHA256]-----+
-
-u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (main)
-$ eval $(ssh-agent -s)
-Agent pid 3536
-
-u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (main)
-$ ssh-add
-Identity added: /c/Users/u113-13/.ssh/id_rsa (u113-13@PROG-23)
-
-u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (main)
-$ cat ~/.ssh/id_ed25519.pub
-cat: /c/Users/u113-13/.ssh/id_ed25519.pub: No such file or directory
-
-u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (main)
-$ ^C
-
-u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (main)
-$ $ cat ~/.ssh/id_ed25519.pub
-bash: $: command not found
-
-u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (main)
-$ $ cat ~/.ssh/id_rsa.pub
-bash: $: command not found
-
-u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (main)
-$  cat ~/.ssh/id_rsa.pub
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDPUxukN6TSyALFkTjGcx+mKcNcMYVCb7kxQ4JvxalE/htjBRwn093fhN5S9jYPmbovF7X7N4oOxfl2Z1eIUtfUq26b6nENPQG8RlA6Z6J6b8bUjlZHzsTYfGTm+AU6K44MtrqWNLCq9hrHd9Ut3Q6tdIB8JHwNlSLwes0YqhwaF4z4sQoX9lHU3P1ZhwvXWrImVoWPT7n4jQJWJ+6+K4cUH6klkVPWyZqKMJkMnzSM+eVWQyiMCnxIIDq/FR/2A5UsmOO6anAYt0oo51PQrUyqsJ4hQf9wsic2FuuAr4suTjLj2F6Pb7XyoS03Y5TLlhXYJ5hdEJoiBriXbeOtR5RL u113-13@PROG-23
-
-16. Создал репозитарий и импортировал данные из gitbash
-$ git remote add origin git@uit.mpei.ru:MovsisianRG/cs-lab02.git
-
-u113-13@PROG-23 MINGW32 ~/Desktop/lab02/alice/project (main)
-$ git push -u origin main
-The authenticity of host 'uit.mpei.ru (10.1.6.13)' can't be established.
-ECDSA key fingerprint is SHA256:+MRh1ssS2MjYzxp1zO+xbhzkFjtvbXFwcP0Nuzb7bD8.
-Are you sure you want to continue connecting (yes/no)? yes
-Warning: Permanently added 'uit.mpei.ru,10.1.6.13' (ECDSA) to the list of known hosts.
-Enumerating objects: 15, done.
-Counting objects: 100% (15/15), done.
-Compressing objects: 100% (14/14), done.
-Writing objects: 100% (15/15), 1.92 KiB | 246.00 KiB/s, done.
-Total 15 (delta 3), reused 0 (delta 0)
-remote: . Processing 1 references
-remote: Processed 1 references in total
-To uit.mpei.ru:MovsisianRG/cs-lab02.git
- * [new branch]      main -> main
-Branch 'main' set up to track remote branch 'main' from 'origin'.
-
-17. Клонировал проект и настроил Git
-$ git clone git@uit.mpei.ru:MovsisianRG/cs-lab02.git project
-Cloning into 'project'...
-remote: Enumerating objects: 15, done.
-remote: Counting objects: 100% (15/15), done.
-remote: Compressing objects: 100% (14/14), done.
-remote: Total 15 (delta 3), reused 0 (delta 0), pack-reused 0
-Receiving objects: 100% (15/15), 1.92 KiB | 246.00 KiB/s, done.
-Resolving deltas: 100% (3/3), done.
-
-u113-13@PROG-23 MINGW32 ~/Desktop/lab02/bob
-$ cd project
-u113-13@PROG-23 MINGW32 ~/Desktop/lab02/bob/project (main)
-
-$ git config user.name 'Alice (MovsisyanRG)'
-
-u113-13@PROG-23 MINGW32 ~/Desktop/lab02/bob/project (main)
-$ git config user.email 'MovsisianRG@mpei.ru'
-
-18. «На машине Боба» добавил в программу печать произведения чисел и сделал коммит, проверил загрузку изменений, историю всех веток, продвинул ветку main к скачанной версии, «От имени Алисы» добавил в программу печать деления, сделайте коммит, отправьте его на сервер и получил новую версию «на машине Боба».
-u113-13@PROG-25 MINGW32 /l/I eo?n/A-3-23/Rafael Movsisyan/lab02/lab02/bob/project (main)
-$ git commit -a -m "code: oiii?aiea a e b"
-[main 434d199] code: oiii?aiea a e b
- 1 file changed, 2 insertions(+), 1 deletion(-)
-u113-13@PROG-25 MINGW32 /l/I eo?n/A-3-23/Rafael Movsisyan/lab02/lab02/bob/project (main)
-$ git push
-Enumerating objects: 5, done.
-Counting objects: 100% (5/5), done.
-Compressing objects: 100% (3/3), done.
-Writing objects: 100% (3/3), 377 bytes | 62.00 KiB/s, done.
-Total 3 (delta 1), reused 0 (delta 0)
-remote: . Processing 1 references
-remote: Processed 1 references in total
-To uit.mpei.ru:MovsisianRG/cs-lab02.git
-   84a34f0..434d199  main -> main
-u113-13@PROG-25 MINGW32 /l/I курс/А-3-23/Rafael Movsisyan/lab02/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), done.
-From uit.mpei.ru:MovsisianRG/cs-lab02
-   84a34f0..434d199  main       -> origin/main
-
-u113-13@PROG-25 MINGW32 /l/I курс/А-3-23/Rafael Movsisyan/lab02/lab02/alice/project (main)
-$ git log --oneline --decorate --all --graph
-* 434d199 (origin/main) code: умножение a и b
-| * 9254bb9 (double) code: сменил инт на дабл
-| * 16d3cd7 code: добавил минимум
-|/
-* 84a34f0 (HEAD -> main) code: добавлена разность a и b
-* dfdb00c code: добавлена сумма a и b
-* 79d7c57 code: заготовка программы с вводом чисел
-* 00a65a5 build: add project file
-* 5fdca83 code: заготовка программы
-
-u113-13@PROG-25 MINGW32 /l/I курс/А-3-23/Rafael Movsisyan/lab02/lab02/alice/project (main)
-$ git pull --ff-only
-
-Updating 84a34f0..434d199
-Fast-forward
- main.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-u113-13@PROG-25 MINGW32 /l/I курс/А-3-23/Rafael Movsisyan/lab02/lab02/alice/project (main)
-$ git commit -a -m "code: деление a и b"
-[main 8168f86] code: деление a и b
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-u113-13@PROG-25 MINGW32 /l/I курс/А-3-23/Rafael Movsisyan/lab02/lab02/alice/project (main)
-$ git push
-Enumerating objects: 5, done.
-Counting objects: 100% (5/5), done.
-Compressing objects: 100% (3/3), done.
-Writing objects: 100% (3/3), 364 bytes | 91.00 KiB/s, done.
-Total 3 (delta 1), reused 0 (delta 0)
-remote: . Processing 1 references
-remote: Processed 1 references in total
-To uit.mpei.ru:MovsisianRG/cs-lab02.git
-   434d199..8168f86  main -> main
-u113-13@PROG-25 MINGW32 /l/I eo?n/A-3-23/Rafael Movsisyan/lab02/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), done.
-From uit.mpei.ru:MovsisianRG/cs-lab02
-   434d199..8168f86  main       -> origin/main
-
-u113-13@PROG-25 MINGW32 /l/I eo?n/A-3-23/Rafael Movsisyan/lab02/lab02/bob/project (main)
-$ git log --oneline --decorate --all --graph
-* 8168f86 (origin/main, origin/HEAD) code: aaeaiea a e b
-* 434d199 (HEAD -> main) code: oiii?aiea a e b
-* 84a34f0 code: aiaaaeaia ?aciinou a e b
-* dfdb00c code: aiaaaeaia noiia a e b
-* 79d7c57 code: caaioiaea i?ia?aiiu n aaiaii ?enae
-* 00a65a5 build: add project file
-* 5fdca83 code: caaioiaea i?ia?aiiu
-
-u113-13@PROG-25 MINGW32 /l/I eo?n/A-3-23/Rafael Movsisyan/lab02/lab02/bob/project (main)
-$
-
-u113-13@PROG-25 MINGW32 /l/I eo?n/A-3-23/Rafael Movsisyan/lab02/lab02/bob/project (main)
-$ git pull --ff-only
-
-Updating 434d199..8168f86
-Fast-forward
- main.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-19. Сделал максимум у Алисы, минимум у Боба и отправил коммиты на сервер
-u113-13@PROG-25 MINGW32 /l/I курс/А-3-23/Rafael Movsisyan/lab02/lab02/alice/project (main)
-$ git commit -a -m "code: max a,b"
-[main b59bab6] code: max a,b
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-u113-13@PROG-25 MINGW32 /l/I курс/А-3-23/Rafael Movsisyan/lab02/lab02/alice/project (main)
-$ git push
-Enumerating objects: 5, done.
-Counting objects: 100% (5/5), done.
-Compressing objects: 100% (3/3), done.
-Writing objects: 100% (3/3), 424 bytes | 106.00 KiB/s, done.
-Total 3 (delta 1), reused 0 (delta 0)
-remote: . Processing 1 references
-remote: Processed 1 references in total
-To uit.mpei.ru:MovsisianRG/cs-lab02.git
-   8168f86..b59bab6  main -> main
-u113-13@PROG-25 MINGW32 /l/I курс/А-3-23/Rafael Movsisyan/lab02/lab02/bob/project (main)
-$ git commit -a -m "code: Min a,b"
-[main 8dab624] code: Min a,b
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-u113-13@PROG-25 MINGW32 /l/I курс/А-3-23/Rafael Movsisyan/lab02/lab02/bob/project (main)
-$ git push
-To uit.mpei.ru:MovsisianRG/cs-lab02.git
- ! [rejected]        main -> main (fetch first)
-error: failed to push some refs to 'git@uit.mpei.ru:MovsisianRG/cs-lab02.git'
-hint: Updates were rejected because the remote contains work that you do
-hint: not have locally. This is usually caused by another repository pushing
-hint: to the same ref. You may want to first integrate the remote changes
-hint: (e.g., 'git pull ...') before pushing again.
-hint: See the 'Note about fast-forwards' in 'git push --help' for details.
-$ 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), done.
-From uit.mpei.ru:MovsisianRG/cs-lab02
-   8168f86..b59bab6  main       -> origin/main
-
-u113-13@PROG-25 MINGW32 /l/I eo?n/A-3-23/Rafael Movsisyan/lab02/lab02/bob/project (main)
-$ git log --oneline --decorate --all --graph
-* 8dab624 (HEAD -> main) code: Min a,b
-| * b59bab6 (origin/main, origin/HEAD) code: max a,b
-|/
-* 8168f86 code: aaeaiea a e b
-* 434d199 code: oiii?aiea a e b
-* 84a34f0 code: aiaaaeaia ?aciinou a e b
-* dfdb00c code: aiaaaeaia noiia a e b
-* 79d7c57 code: caaioiaea i?ia?aiiu n aaiaii ?enae
-* 00a65a5 build: add project file
-* 5fdca83 code: caaioiaea i?ia?aiiu
-u113-13@PROG-25 MINGW32 /l/I eo?n/A-3-23/Rafael Movsisyan/lab02/lab02/bob/project (main|REBASE 1/1)
-$ git add main.cpp
-
-u113-13@PROG-25 MINGW32 /l/I eo?n/A-3-23/Rafael Movsisyan/lab02/lab02/bob/project (main|REBASE 1/1)
-$ git rebase --continue
-Applying: code: Min a,b
-
-u113-13@PROG-25 MINGW32 /l/I eo?n/A-3-23/Rafael Movsisyan/lab02/lab02/bob/project (main)
-$ git fetch
-
-u113-13@PROG-25 MINGW32 /l/I eo?n/A-3-23/Rafael Movsisyan/lab02/lab02/bob/project (main)
-$ git log --oneline --decorate --all --graph
-* 8f5697c (HEAD -> main) code: Min a,b
-* b59bab6 (origin/main, origin/HEAD) code: max a,b
-* 8168f86 code: aaeaiea a e b
-* 434d199 code: oiii?aiea a e b
-* 84a34f0 code: aiaaaeaia ?aciinou a e b
-* dfdb00c code: aiaaaeaia noiia a e b
-* 79d7c57 code: caaioiaea i?ia?aiiu n aaiaii ?enae
-* 00a65a5 build: add project file
-* 5fdca83 code: caaioiaea i?ia?aiiu
-
-u113-13@PROG-25 MINGW32 /l/I eo?n/A-3-23/Rafael Movsisyan/lab02/lab02/bob/project (main)
-$
-20. Добавил ветку double, изменил тип переменных а и b на double, синхронизировал ветку main на Алисе с сервером и слил ветку double в 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), done.
-From uit.mpei.ru:MovsisianRG/cs-lab02
-   b59bab6..8f5697c  main       -> origin/main
-
-u113-13@PROG-25 MINGW32 /l/I eo?n/A-3-23/Rafael Movsisyan/lab02/lab02/alice/project (main)
-$ git log --oneline --decorate --all --graph
-* 7ec4e0d (double) code: double a,b
-* 9254bb9 code: niaiee eio ia aaae
-* 16d3cd7 code: aiaaaee ieieioi
-| * 8f5697c (origin/main) code: Min a,b
-| * b59bab6 (HEAD -> main) code: max a,b
-| * 8168f86 code: aaeaiea a e b
-| * 434d199 code: oiii?aiea a e b
-|/
-* 84a34f0 code: aiaaaeaia ?aciinou a e b
-* dfdb00c code: aiaaaeaia noiia a e b
-* 79d7c57 code: caaioiaea i?ia?aiiu n aaiaii ?enae
-* 00a65a5 build: add project file
-* 5fdca83 code: caaioiaea i?ia?aiiu
-
-u113-13@PROG-25 MINGW32 /l/I eo?n/A-3-23/Rafael Movsisyan/lab02/lab02/alice/project (main)
-$ git pull --ff-only
-Updating b59bab6..8f5697c
-Fast-forward
- main.cpp | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-u113-13@PROG-25 MINGW32 /l/I eo?n/A-3-23/Rafael Movsisyan/lab02/lab02/alice/project (main)
-$ git fetch
-
-u113-13@PROG-25 MINGW32 /l/I eo?n/A-3-23/Rafael Movsisyan/lab02/lab02/alice/project (main)
-$ git log --oneline --decorate --all --graph
-* 7ec4e0d (double) code: double a,b
-* 9254bb9 code: niaiee eio ia aaae
-* 16d3cd7 code: aiaaaee ieieioi
-| * 8f5697c (HEAD -> main, origin/main) code: Min a,b
-| * b59bab6 code: max a,b
-| * 8168f86 code: aaeaiea a e b
-| * 434d199 code: oiii?aiea a e b
-|/
-* 84a34f0 code: aiaaaeaia ?aciinou a e b
-* dfdb00c code: aiaaaeaia noiia a e b
-* 79d7c57 code: caaioiaea i?ia?aiiu n aaiaii ?enae
-* 00a65a5 build: add project file
-* 5fdca83 code: caaioiaea i?ia?aiiu
-u113-13@PROG-25 MINGW32 /l/I eo?n/A-3-23/Rafael Movsisyan/lab02/lab02/alice/project (main|MERGING)
-$ git add main.cpp
-
-u113-13@PROG-25 MINGW32 /l/I eo?n/A-3-23/Rafael Movsisyan/lab02/lab02/alice/project (main|MERGING)
-$ git merge --continue
-[main 63c7f6a] Merge branch 'double' into main neee aaoeo double a main
-
-u113-13@PROG-25 MINGW32 /l/I eo?n/A-3-23/Rafael Movsisyan/lab02/lab02/alice/project (main)
-$ git push
-Enumerating objects: 17, done.
-Counting objects: 100% (17/17), done.
-Compressing objects: 100% (13/13), done.
-Writing objects: 100% (13/13), 1.59 KiB | 56.00 KiB/s, done.
-Total 13 (delta 4), reused 0 (delta 0)
-remote: . Processing 1 references
-remote: Processed 1 references in total
-To uit.mpei.ru:MovsisianRG/cs-lab02.git
-   8f5697c..63c7f6a  main -> main
-
-u113-13@PROG-25 MINGW32 /l/I eo?n/A-3-23/Rafael Movsisyan/lab02/lab02/alice/project (main)
-$
-
-
-
-