cs-lab02/README.md

Отсчёт по лабораторной работе № 2 "Система контроля версий Git"

Выполнил: Огарков И. А. Группа: А-02-23 Проверил: Козлюк Д. А.

Примечание: работа выполнялась на Windows.

1. Создал на рабочем столе каталог lab02 и запустил в нем Git Bash, приглашение:

Александр@DESKTOP-VHTT7N5 MINGW64 ~/Desktop/lab02 $ ls

2. Просмотрел файлы в рабочем каталоге можно командой "ls" --- пусто:

Александр@DESKTOP-VHTT7N5 MINGW64 ~/Desktop/lab02 $ ls

Александр@DESKTOP-VHTT7N5 MINGW64 ~/Desktop/lab02 $

3. Создал каталоги Алисы и Боба, создал каталог "project", изучил команду "cd" в процессе:

Александр@DESKTOP-VHTT7N5 MINGW64 ~/Desktop/lab02 $ mkdir alice

Александр@DESKTOP-VHTT7N5 MINGW64 ~/Desktop/lab02 $ mkdir bob

Александр@DESKTOP-VHTT7N5 MINGW64 ~/Desktop/lab02 $ cd alice

Александр@DESKTOP-VHTT7N5 MINGW64 ~/Desktop/lab02/alice $ mkdir project

Александр@DESKTOP-VHTT7N5 MINGW64 ~/Desktop/lab02/alice $ ls project/

Александр@DESKTOP-VHTT7N5 MINGW64 ~/Desktop/lab02/alice $ cd project

4. Инициализировал репозитарий:

Александр@DESKTOP-VHTT7N5 MINGW64 ~/Desktop/lab02/alice/project $ git init Initialized empty Git repository in C:/Users/Александр/Desktop/lab02/alice/project/.git/

Александр@DESKTOP-VHTT7N5 MINGW64 ~/Desktop/lab02/alice/project (master) $ git branch -m main Александр@DESKTOP-VHTT7N5 MINGW64 ~/Desktop/lab02/alice/project (main) $

Александр@DESKTOP-VHTT7N5 MINGW64 ~/Desktop/lab02/alice/project (main) $ ls -A .git/

Александр@DESKTOP-VHTT7N5 MINGW64 ~/Desktop/lab02/alice/project (main) $ git config user.name 'Alice (OgarkovIA)'

Александр@DESKTOP-VHTT7N5 MINGW64 ~/Desktop/lab02/alice/project (main) $ git config user.email 'OgarkovIA@mpei.ru'

5. Создание коммитов

Запустил CodeBlocks и создал проект в репозитории Алисы

(Говорят, что нужно пояснить каждую строку...) Александр@DESKTOP-VHTT7N5 MINGW64 ~/Desktop/lab02/alice/project (main) $ git status On branch main

No commits yet

Untracked files: (use "git add ..." to include in what will be committed) main.cpp project.cbp project.layout

nothing added to commit but untracked files present (use "git add" to track)

Александр@DESKTOP-VHTT7N5 MINGW64 ~/Desktop/lab02/alice/project (main) $ git add main.cpp

Александр@DESKTOP-VHTT7N5 MINGW64 ~/Desktop/lab02/alice/project (main) $ git commit -m 'code: заготовка программы' [main be8cf41] code: заготовка программы 1 file changed, 9 insertions(+) create mode 100644 main.cpp

6. Составление сообщений к коммитам

Александр@DESKTOP-VHTT7N5 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 Александр@DESKTOP-VHTT7N5 MINGW64 ~/Desktop/lab02/alice/project (main) $ git status On branch main

No commits yet

Changes to be committed: (use "git rm --cached ..." to unstage) new file: project.cbp

Untracked files: (use "git add ..." to include in what will be committed) main.cpp project.layout

Александр@DESKTOP-VHTT7N5 MINGW64 ~/Desktop/lab02/alice/project (main) $ git commit -m 'build: добавлен файл проекта' [main (root-commit) e2c2965] build: добавлен файл проекта 1 file changed, 38 insertions(+) create mode 100644 project.cbp

Заменил тело функции main() на ввод двух чисел: cout << "Enter A and B: "; int a, b; cin >> a >> b;

Александр@DESKTOP-VHTT7N5 MINGW64 ~/Desktop/lab02/alice/project (main) $ git status On branch main Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git restore ..." to discard changes in working directory) modified: main.cpp

Untracked files: (use "git add ..." to include in what will be committed) bin/ obj/ project.layout

no changes added to commit (use "git add" and/or "git commit -a")

Александр@DESKTOP-VHTT7N5 MINGW64 ~/Desktop/lab02/alice/project (main) $ git add main.cpp

Александр@DESKTOP-VHTT7N5 MINGW64 ~/Desktop/lab02/alice/project (main) $ git commit -m 'build: замена тела функции main() на ввод двух чисел' [main b054ecc] build: замена тела функции main() на ввод двух чисел 1 file changed, 5 insertions(+), 1 deletion(-)

Александр@DESKTOP-VHTT7N5 MINGW64 ~/Desktop/lab02/alice/project (main) $ git add main.cpp

Александр@DESKTOP-VHTT7N5 MINGW64 ~/Desktop/lab02/alice/project (main) $ git commit -m 'build: добавлен вывод суммы чисел a и b' [main 1d03b32] build: добавлен вывод суммы чисел a и b 1 file changed, 3 insertions(+), 2 deletions(-)

Александр@DESKTOP-VHTT7N5 MINGW64 ~/Desktop/lab02/alice/project (main) $ git add main.cpp

Александр@DESKTOP-VHTT7N5 MINGW64 ~/Desktop/lab02/alice/project (main) $ git commit -m 'build: добавлен вывод разности чисел a и b' [main ae25d74] build: добавлен вывод разности чисел a и b 1 file changed, 3 insertions(+)

7. Игнорирование файлов

Создал файл '.gitignore' и добавил в него игнорируемые каталоги и файлы

$ git status On branch main Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git restore ..." to discard changes in working directory) modified: .gitignore

Untracked files: (use "git add ..." to include in what will be committed) Empty.c

no changes added to commit (use "git add" and/or "git commit -a")

Александр@DESKTOP-VHTT7N5 MINGW64 ~/Desktop/lab02/alice/project (main) $ git add .gitignore

Александр@DESKTOP-VHTT7N5 MINGW64 ~/Desktop/lab02/alice/project (main) $ git commit -m 'git: добавлен .gitignore для игнорирования каталога bin и obj, а также файлов *.layout' [main 8536918] git: добавлен .gitignore для игнорирования каталога bin и obj, а также файлов *.layout 1 file changed, 1 insertion(+), 1 deletion(-)

8. Просмотр истории

Александр@DESKTOP-VHTT7N5 MINGW64 ~/Desktop/lab02/alice/project (main) $ git log commit 8536918c1245f46b7fc5a65cb04d5c0f5002cb14 (HEAD -> main) Author: Alice (OgarkovIA) OgarkovIA@mpei.ru Date: Sat Mar 23 22:30:48 2024 +0300

git: добавлен .gitignore для игнорирования каталога bin и obj, а также файлов *.layout

commit 6ea8a09575 Author: Alice (OgarkovIA) OgarkovIA@mpei.ru Date: Sat Mar 23 22:25:57 2024 +0300

git: добавлен .gitignore для игнорирования каталога bin и obj, а также файлов *.layout

commit ae25d74380 Author: Alice (OgarkovIA) OgarkovIA@mpei.ru Date: Sat Mar 23 22:05:04 2024 +0300

build: добавлен вывод разности чисел a и b

commit 1d03b32a96 Author: Alice (OgarkovIA) OgarkovIA@mpei.ru Date: Sat Mar 23 21:50:28 2024 +0300

build: добавлен вывод суммы чисел a и b

commit b054ecc9e3 Author: Alice (OgarkovIA) OgarkovIA@mpei.ru Date: Sat Mar 23 20:06:39 2024 +0300

:

Александр@DESKTOP-VHTT7N5 MINGW64 ~/Desktop/lab02/alice/project (main) $ git log --stat commit 8536918c1245f46b7fc5a65cb04d5c0f5002cb14 (HEAD -> main) Author: Alice (OgarkovIA) OgarkovIA@mpei.ru Date: Sat Mar 23 22:30:48 2024 +0300

git: добавлен .gitignore для игнорирования каталога bin и obj, а также файлов *.layout

.gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6ea8a09575 Author: Alice (OgarkovIA) OgarkovIA@mpei.ru Date: Sat Mar 23 22:25:57 2024 +0300

git: добавлен .gitignore для игнорирования каталога bin и obj, а также файлов *.layout

.gitignore | 3 +++ 1 file changed, 3 insertions(+)

commit ae25d74380 Author: Alice (OgarkovIA) OgarkovIA@mpei.ru Date: Sat Mar 23 22:05:04 2024 +0300

build: добавлен вывод разности чисел a и b

main.cpp | 3 +++ 1 file changed, 3 insertions(+)

commit 1d03b32a96

Александр@DESKTOP-VHTT7N5 MINGW64 ~/Desktop/lab02/alice/project (main) $ git log --oneline --decorate 8536918 (HEAD -> main) git: добавлен .gitignore для игнорирования каталога bin и obj, а также файлов *.layout 6ea8a09 git: добавлен .gitignore для игнорирования каталога bin и obj, а также файлов *.layout ae25d74 build: добавлен вывод разности чисел a и b 1d03b32 build: добавлен вывод суммы чисел a и b b054ecc build: замена тела функции main() на ввод двух чисел be8cf41 code: заготовка программы e2c2965 build: добавлен файл проекта

Александр@DESKTOP-VHTT7N5 MINGW64 ~/Desktop/lab02/alice/project (main) $ git log --oneline --decorate --all --graph

• 8536918 (HEAD -> main) git: добавлен .gitignore для игнорирования каталога bin и obj, а также файлов *.layout
• 6ea8a09 git: добавлен .gitignore для игнорирования каталога bin и obj, а также файлов *.layout
• ae25d74 build: добавлен вывод разности чисел a и b
• 1d03b32 build: добавлен вывод суммы чисел a и b
• b054ecc build: замена тела функции main() на ввод двух чисел
• be8cf41 code: заготовка программы
• e2c2965 build: добавлен файл проекта

Александр@DESKTOP-VHTT7N5 MINGW64 ~/Desktop/lab02/alice/project (main) $ git log -- main.cpp commit ae25d74380 Author: Alice (OgarkovIA) OgarkovIA@mpei.ru Date: Sat Mar 23 22:05:04 2024 +0300

build: добавлен вывод разности чисел a и b

commit 1d03b32a96 Author: Alice (OgarkovIA) OgarkovIA@mpei.ru Date: Sat Mar 23 21:50:28 2024 +0300

build: добавлен вывод суммы чисел a и b

commit b054ecc9e3 Author: Alice (OgarkovIA) OgarkovIA@mpei.ru Date: Sat Mar 23 20:06:39 2024 +0300

build: замена тела функции main() на ввод двух чисел

commit be8cf41c0a Author: Alice (OgarkovIA) OgarkovIA@mpei.ru Date: Sat Mar 23 19:49:33 2024 +0300

code: заготовка программы

Александр@DESKTOP-VHTT7N5 MINGW64 ~/Desktop/lab02/alice/project (main) $ git log --grep 'code:' commit be8cf41c0a Author: Alice (OgarkovIA) OgarkovIA@mpei.ru Date: Sat Mar 23 19:49:33 2024 +0300

code: заготовка программы

Александр@DESKTOP-VHTT7N5 MINGW64 ~/Desktop/lab02/alice/project (main) $ git log --grep 'build:' commit ae25d74380 Author: Alice (OgarkovIA) OgarkovIA@mpei.ru Date: Sat Mar 23 22:05:04 2024 +0300

build: добавлен вывод разности чисел a и b

commit 1d03b32a96 Author: Alice (OgarkovIA) OgarkovIA@mpei.ru Date: Sat Mar 23 21:50:28 2024 +0300

build: добавлен вывод суммы чисел a и b

commit b054ecc9e3 Author: Alice (OgarkovIA) OgarkovIA@mpei.ru Date: Sat Mar 23 20:06:39 2024 +0300

build: замена тела функции main() на ввод двух чисел

commit e2c29656fb Author: Alice (OgarkovIA) OgarkovIA@mpei.ru Date: Sat Mar 23 19:46:47 2024 +0300

build: добавлен файл проекта

Александр@DESKTOP-VHTT7N5 MINGW64 ~/Desktop/lab02/alice/project (main) $ git log -- project.cbp commit e2c29656fb Author: Alice (OgarkovIA) OgarkovIA@mpei.ru Date: Sat Mar 23 19:46:47 2024 +0300

build: добавлен файл проекта

Александр@DESKTOP-VHTT7N5 MINGW64 ~/Desktop/lab02/alice/project (main) $ git show HEAD~2 commit ae25d74380 Author: Alice (OgarkovIA) OgarkovIA@mpei.ru Date: Sat Mar 23 22:05:04 2024 +0300

build: добавлен вывод разности чисел a и b

diff --git a/main.cpp b/main.cpp index 0789c44..ecca766 100644 --- a/main.cpp +++ b/main.cpp @@ -10,5 +10,8 @@ int main() { int sum = a + b; cout << "Sum of A and B is: " << sum << endl;

• int difference = a - b;
• cout << "Difference of A and B is: " << difference << endl;
• return 0; }

Александр@DESKTOP-VHTT7N5 MINGW64 ~/Desktop/lab02/alice/project (main) $ git diff HEAD~2 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9d83ebf --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +/bin +/obj +*.layout

9. Отказ изменений

Александр@DESKTOP-VHTT7N5 MINGW64 ~/Desktop/lab02/alice/project (main) $ git reset --hard HEAD~1 HEAD is now at 6ea8a09 git: добавлен .gitignore для игнорирования каталога bin и obj, а также файлов *.layout

Добавил над функцией main() комментарий: // you may type whatever you want Александр@DESKTOP-VHTT7N5 MINGW64 ~/Desktop/lab02/alice/project (main) $ git checkout HEAD -- main.cpp

10. Обмен кодом через удалённое хранилище

Сделал регистрацию на сайте Git УИТ

Александр@DESKTOP-VHTT7N5 MINGW64 ~/Desktop/lab02/alice/project (main) $ ssh-keygen Generating public/private ed25519 key pair. Enter file in which to save the key (/c/Users/Александр/.ssh/id_ed25519): Created directory '/c/Users/\320\220\320\273\320\265\320\272\321\201\320\260\320\275\320\264\321\200/.ssh'. Enter passphrase (empty for no passphrase): Enter same passphrase again: Your identification has been saved in /c/Users/Александр/.ssh/id_ed25519 Your public key has been saved in /c/Users/Александр/.ssh/id_ed25519.pub The key fingerprint is: SHA256:cM4BHuYMNX5QKY+NY+w4ovZj8jcYJa3SUntV+J1TBQ0 Александр@DESKTOP-VHTT7N5 The key's randomart image is: +--[ED25519 256]--+ | ..B.o. E=. | | B... . . | | ..** . o | | o o*Boo + | | o =+..S . | | o.=o.. | | .o.+. | |.o + o | |. =oo . | +----[SHA256]-----+

Александр@DESKTOP-VHTT7N5 MINGW64 ~/Desktop/lab02/alice/project (main) eval(ssh-agent -s) Agent pid 2185

Александр@DESKTOP-VHTT7N5 MINGW64 ~/Desktop/lab02/alice/project (main) $ ssh-add Enter passphrase for /c/Users/Александр/.ssh/id_ed25519: Identity added: /c/Users/Александр/.ssh/id_ed25519 (Александр@DESKTOP-VHTT7N5)

Александр@DESKTOP-VHTT7N5 MINGW64 ~/Desktop/lab02/alice/project (main) $ cat ~/.ssh/id_ed25519.pub ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICFHv0MW5ahhx8YMeo/JBwqOXU8eSfOShn9+ZqJWxzAc Александр@DESKTOP-VHTT7N5

Скопировал открытый ключ и добавил в список открытых ключейсвоей учётной записи

Отправил проект на сервер

Александр@DESKTOP-VHTT7N5 MINGW64 ~/Desktop/lab02/bob $ git clone http://uit.mpei.ru/git/OgarkovIA/cs-lab02.git project Cloning into 'project'... remote: Enumerating objects: 26, done. remote: Counting objects: 100% (26/26), done. remote: Compressing objects: 100% (24/24), done. remote: Total 26 (delta 5), reused 0 (delta 0), pack-reused 0 Receiving objects: 100% (26/26), 6.46 KiB | 140.00 KiB/s, done. Resolving deltas: 100% (5/5), done.

Александр@DESKTOP-VHTT7N5 MINGW64 ~/Desktop/lab02/bob $ cd project

Александр@DESKTOP-VHTT7N5 MINGW64 ~/Desktop/lab02/bob/project (main) $ git config user.name 'Bob (OgarkovIA)'

Александр@DESKTOP-VHTT7N5 MINGW64 ~/Desktop/lab02/bob/project (main) $ git config user.name 'OgarkovIA@mpei.ru'

Александр@DESKTOP-VHTT7N5 MINGW64 ~/Desktop/lab02/bob/project (main) $ git add -u

Александр@DESKTOP-VHTT7N5 MINGW64 ~/Desktop/lab02/bob/project (main) $ git commit -m 'build: добавление произведения чисел a и b' [main 2ecdc02] build: добавление произведения чисел a и b 1 file changed, 3 insertions(+)

Александр@DESKTOP-VHTT7N5 MINGW64 ~/Desktop/lab02/bob/project (main) $ git push Enumerating objects: 5, done. Counting objects: 100% (5/5), done. Delta compression using up to 6 threads Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 430 bytes | 430.00 KiB/s, done. Total 3 (delta 2), reused 0 (delta 0), pack-reused 0 (from 0) remote: . Processing 1 references remote: Processed 1 references in total To http://uit.mpei.ru/git/OgarkovIA/cs-lab02.git 86473f7..2ecdc02 main -> main

Александр@DESKTOP-VHTT7N5 MINGW64 ~/Desktop/lab02/alice/project (main) $ git fetch remote: Enumerating objects: 17, done. remote: Counting objects: 100% (17/17), done. remote: Compressing objects: 100% (13/13), done. remote: Total 14 (delta 4), reused 0 (delta 0), pack-reused 0 Unpacking objects: 100% (14/14), 4.80 KiB | 5.00 KiB/s, done. From http://uit.mpei.ru/git/OgarkovIA/cs-lab02 6ea8a09..2ecdc02 main -> origin/main

Александр@DESKTOP-VHTT7N5 MINGW64 ~/Desktop/lab02/alice/project (main) $ git log --oneline --decorate --all --graph

• 2ecdc02 (origin/main) build: добавление произведения чисел a и b
• 86473f7 Изменил(а) на '.gitignore'
• 6cd3e6c Удалить 'README.txt'
• 0f80225 Загрузил(а) файлы в ''
• dbc8a28 Загрузил(а) файлы в '' | * 09099be (HEAD -> main) add: bin |/
• 6ea8a09 git: добавлен .gitignore для игнорирования каталога bin и obj, а также файлов *.layout
• ae25d74 build: добавлен вывод разности чисел a и b
• 1d03b32 build: добавлен вывод суммы чисел a и b
• b054ecc build: замена тела функции main() на ввод двух чисел
• be8cf41 code: заготовка программы
• e2c2965 build: добавлен файл проекта

u113-03@PROG-01 MINGW32 ~/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 2), reused 0 (delta 0), pack-reused 0 Unpacking objects: 100% (3/3), done. From http://uit.mpei.ru/git/OgarkovIA/cs-lab02 2ecdc02..ff4954f main -> origin/main

u113-03@PROG-01 MINGW32 ~/Desktop/lab02/bob/project (main) $ git log --oneline --decorate --all --graph

• ff4954f (origin/main, origin/HEAD) build: Äîáàâèë äåëåíèå
• 2ecdc02 (HEAD -> main) build: äîáàâëåíèå ïðîèçâåäåíèÿ ÷èñåë a è b
• 86473f7 Èçìåíèë(à) íà '.gitignore'
• 6cd3e6c Óäàëèòü 'README.txt'
• 0f80225 Çàãðóçèë(à) ôàéëû â ''
• dbc8a28 Çàãðóçèë(à) ôàéëû â ''
• 6ea8a09 git: äîáàâëåí .gitignore äëÿ èãíîðèðîâàíèÿ êàòàëîãà bin è obj, à òàêæå ôàéëîâ *.layout
• ae25d74 build: äîáàâëåí âûâîä ðàçíîñòè ÷èñåë a è b
• 1d03b32 build: äîáàâëåí âûâîä ñóììû ÷èñåë a è b
• b054ecc build: çàìåíà òåëà ôóíêöèè main() íà ââîä äâóõ ÷èñåë
• be8cf41 code: çàãîòîâêà ïðîãðàììû
• e2c2965 build: äîáàâëåí ôàéë ïðîåêòà

u113-03@PROG-01 MINGW32 ~/Desktop/lab02/bob/project (main) $ git pull --ff-only Updating 2ecdc02..ff4954f Fast-forward main.cpp | 3 +++ 1 file changed, 3 insertions(+)

u113-03@PROG-01 MINGW32 ~/Desktop/lab02/bob/project (main) $ git add -u

u113-03@PROG-01 MINGW32 ~/Desktop/lab02/bob/project (main) $ git commit -m "build: Äîáàâëåíèå ìèíèìàëüíîãî èç äâóõ" [main 97b0f60] build: Äîáàâëåíèå ìèíèìàëüíîãî èç äâóõ 1 file changed, 2 insertions(+)

u113-03@PROG-01 MINGW32 ~/Desktop/lab02/bob/project (main) $ git push To http://uit.mpei.ru/git/OgarkovIA/cs-lab02.git ! [rejected] main -> main (fetch first) error: failed to push some refs to 'http://uit.mpei.ru/git/OgarkovIA/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.

u113-03@PROG-01 MINGW32 ~/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 2), reused 0 (delta 0), pack-reused 0 Unpacking objects: 100% (3/3), done. From http://uit.mpei.ru/git/OgarkovIA/cs-lab02 ff4954f..5c75b75 main -> origin/main

u113-03@PROG-01 MINGW32 ~/Desktop/lab02/bob/project (main) $ git git log --oneline --decorate --all --graph git: 'git' is not a git command. See 'git --help'.

The most similar command is init

u113-03@PROG-01 MINGW32 ~/Desktop/lab02/bob/project (main) $ git log --oneline --decorate --all --graph

• 97b0f60 (HEAD -> main) build: Äîáàâëåíèå ìèíèìàëüíîãî èç äâóõ | * 5c75b75 (origin/main, origin/HEAD) build: äîáàâëåíèå ìàêñèìóìà |/
• ff4954f build: Äîáàâèë äåëåíèå
• 2ecdc02 build: äîáàâëåíèå ïðîèçâåäåíèÿ ÷èñåë a è b
• 86473f7 Èçìåíèë(à) íà '.gitignore'
• 6cd3e6c Óäàëèòü 'README.txt'
• 0f80225 Çàãðóçèë(à) ôàéëû â ''
• dbc8a28 Çàãðóçèë(à) ôàéëû â ''

u113-03@PROG-01 MINGW32 ~/Desktop/lab02/alice/project (main) $ git push remote: Verify fatal: Authentication failed for 'http://uit.mpei.ru/git/OgarkovIA/cs-lab02.git/'

u113-03@PROG-01 MINGW32 ~/Desktop/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), 384 bytes | 384.00 KiB/s, done. Total 3 (delta 2), reused 0 (delta 0) remote: . Processing 1 references remote: Processed 1 references in total To http://uit.mpei.ru/git/OgarkovIA/cs-lab02.git 2ecdc02..ff4954f main -> main

u113-03@PROG-01 MINGW32 ~/Desktop/lab02/alice/project (main) $ git add -u

u113-03@PROG-01 MINGW32 ~/Desktop/lab02/alice/project (main) $ git commit -m "build: äîáàâëåíèå ìàêñèìóìà" [main 5c75b75] build: äîáàâëåíèå ìàêñèìóìà 1 file changed, 3 insertions(+), 1 deletion(-)

u113-03@PROG-01 MINGW32 ~/Desktop/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), 389 bytes | 389.00 KiB/s, done. Total 3 (delta 2), reused 0 (delta 0) remote: . Processing 1 references remote: Processed 1 references in total To http://uit.mpei.ru/git/OgarkovIA/cs-lab02.git ff4954f..5c75b75 main -> main

u113-03@PROG-01 MINGW32 ~/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 2), reused 0 (delta 0), pack-reused 0 Unpacking objects: 100% (3/3), done. From http://uit.mpei.ru/git/OgarkovIA/cs-lab02 5c75b75..b3703a1 main -> origin/main

u113-03@PROG-01 MINGW32 ~/Desktop/lab02/alice/project (main) $ git show HEAD commit 5c75b75139 (HEAD -> main) Author: Alice (OgarkovIA) OgarkovIA@mpei.ru Date: Mon Apr 8 14:37:12 2024 +0300

build: äîáàâëåíèå ìàêñèìóìà

diff --git a/main.cpp b/main.cpp index b47e260..5dce5bb 100644 --- a/main.cpp +++ b/main.cpp @@ -17,7 +17,9 @@ int main() { cout << "Proizvedenie of A and B is: " << proizv << endl;

 float delenie = a / b;

• cout << "Delenie of A and B is " << delenie << endl;

• cout << "Delenie of A and B is: " << delenie << endl;

• cout << "Maksimalnoe of A and B is: " << max(a, b) << endl;

  return 0; }

u113-03@PROG-01 MINGW32 ~/Desktop/lab02/alice/project (main) $ git branch double

u113-03@PROG-01 MINGW32 ~/Desktop/lab02/alice/project (main) $ git checkout double Switched to branch 'double'

u113-03@PROG-01 MINGW32 ~/Desktop/lab02/alice/project (double) $ git log --oneline --decorate --all --graph

• b3703a1 (origin/main, origin/HEAD) build: Äîáàâëåíèå ìèíèìàëüíîãî èç äâóõ
• 5c75b75 (HEAD -> double, main) build: äîáàâëåíèå ìàêñèìóìà
• ff4954f build: Äîáàâèë äåëåíèå
• 2ecdc02 build: äîáàâëåíèå ïðîèçâåäåíèÿ ÷èñåë a è b
• 86473f7 Èçìåíèë(à) íà '.gitignore'
• 6cd3e6c Óäàëèòü 'README.txt'
• 0f80225 Çàãðóçèë(à) ôàéëû â ''
• dbc8a28 Çàãðóçèë(à) ôàéëû â ''
• 6ea8a09 git: äîáàâëåí .gitignore äëÿ èãíîðèðîâàíèÿ êàòàëîãà bin è obj, à òàêæå ôàéëîâ *.layout
• ae25d74 build: äîáàâëåí âûâîä ðàçíîñòè ÷èñåë a è b
• 1d03b32 build: äîáàâëåí âûâîä ñóììû ÷èñåë a è b
• b054ecc build: çàìåíà òåëà ôóíêöèè main() íà ââîä äâóõ ÷èñåë
• be8cf41 code: çàãîòîâêà ïðîãðàììû
• e2c2965 build: äîáàâëåí ôàéë ïðîåêòà

u113-03@PROG-01 MINGW32 ~/Desktop/lab02/alice/project (double) $ git add -u

u113-03@PROG-01 MINGW32 ~/Desktop/lab02/alice/project (double) $ git commit -m "bild: Äîáàâëåíèå double" [double e92905b] bild: Äîáàâëåíèå double 1 file changed, 5 insertions(+), 5 deletions(-)

u113-03@PROG-01 MINGW32 ~/Desktop/lab02/alice/project (double) $ git chekout main git: 'chekout' is not a git command. See 'git --help'.

The most similar command is checkout

u113-03@PROG-01 MINGW32 ~/Desktop/lab02/alice/project (double) $ git checkout main Switched to branch 'main' Your branch is behind 'origin/main' by 1 commit, and can be fast-forwarded. (use "git pull" to update your local branch)

u113-03@PROG-01 MINGW32 ~/Desktop/lab02/alice/project (main) $ git fetch

u113-03@PROG-01 MINGW32 ~/Desktop/lab02/alice/project (main) $ git log --oneline --decorate --all --graph

• e92905b (double) bild: Äîáàâëåíèå double | * b3703a1 (origin/main, origin/HEAD) build: Äîáàâëåíèå ìèíèìàëüíîãî èç äâóõ |/
• 5c75b75 (HEAD -> main) build: äîáàâëåíèå ìàêñèìóìà
• ff4954f build: Äîáàâèë äåëåíèå
• 2ecdc02 build: äîáàâëåíèå ïðîèçâåäåíèÿ ÷èñåë a è b
• 86473f7 Èçìåíèë(à) íà '.gitignore'
• 6cd3e6c Óäàëèòü 'README.txt'
• 0f80225 Çàãðóçèë(à) ôàéëû â ''
• dbc8a28 Çàãðóçèë(à) ôàéëû â ''
• 6ea8a09 git: äîáàâëåí .gitignore äëÿ èãíîðèðîâàíèÿ êàòàëîãà bin è obj, à òàêæå ôàéëîâ *.layout
• ae25d74 build: äîáàâëåí âûâîä ðàçíîñòè ÷èñåë a è b
• 1d03b32 build: äîáàâëåí âûâîä ñóììû ÷èñåë a è b
• b054ecc build: çàìåíà òåëà ôóíêöèè main() íà ââîä äâóõ ÷èñåë
• be8cf41 code: çàãîòîâêà ïðîãðàììû
• e2c2965 build: äîáàâëåí ôàéë ïðîåêòà

u113-03@PROG-01 MINGW32 ~/Desktop/lab02/alice/project (main) $ git merge double Updating 5c75b75..e92905b Fast-forward main.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)

u113-03@PROG-01 MINGW32 ~/Desktop/lab02/alice/project (main) $ git push To http://uit.mpei.ru/git/OgarkovIA/cs-lab02.git ! [rejected] main -> main (non-fast-forward) error: failed to push some refs to 'http://uit.mpei.ru/git/OgarkovIA/cs-lab02.git' hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. Integrate the remote changes (e.g. hint: 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details.

u113-03@PROG-01 MINGW32 ~/Desktop/lab02/alice/project (main) $ git push To http://uit.mpei.ru/git/OgarkovIA/cs-lab02.git ! [rejected] main -> main (non-fast-forward) error: failed to push some refs to 'http://uit.mpei.ru/git/OgarkovIA/cs-lab02.git' hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. Integrate the remote changes (e.g. hint: 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details.

u113-03@PROG-01 MINGW32 ~/Desktop/lab02/alice/project (main) $

• 6ea8a09 git: äîáàâëåí .gitignore äëÿ èãíîðèðîâàíèÿ êàòàëîãà bin è obj, à òàêæå ôàéëîâ *.layout
• ae25d74 build: äîáàâëåí âûâîä ðàçíîñòè ÷èñåë a è b
• 1d03b32 build: äîáàâëåí âûâîä ñóììû ÷èñåë a è b
• b054ecc build: çàìåíà òåëà ôóíêöèè main() íà ââîä äâóõ ÷èñåë
• be8cf41 code: çàãîòîâêà ïðîãðàììû
• e2c2965 build: äîáàâëåí ôàéë ïðîåêòà

u113-03@PROG-01 MINGW32 ~/Desktop/lab02/bob/project (main) $ git rebase origin/main First, rewinding head to replay your work on top of it... Applying: build: Äîáàâëåíèå ìèíèìàëüíîãî èç äâóõ Using index info to reconstruct a base tree... M main.cpp Falling back to patching base and 3-way merge... Auto-merging main.cpp

u113-03@PROG-01 MINGW32 ~/Desktop/lab02/bob/project (main) $ git add main.cpp

u113-03@PROG-01 MINGW32 ~/Desktop/lab02/bob/project (main) $ git rebase --continue fatal: No rebase in progress?

u113-03@PROG-01 MINGW32 ~/Desktop/lab02/bob/project (main) $ git rebase origin/main Current branch main is up to date.

u113-03@PROG-01 MINGW32 ~/Desktop/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), 385 bytes | 385.00 KiB/s, done. Total 3 (delta 2), reused 0 (delta 0) remote: . Processing 1 references remote: Processed 1 references in total To http://uit.mpei.ru/git/OgarkovIA/cs-lab02.git 5c75b75..b3703a1 main -> main

u113-03@PROG-01 MINGW32 ~/Desktop/lab02/bob/project (main)