Отчет по лабораторной работе № 2 «Система контроля версий Git»
Выполнил: Кантимиров Д.Д.
Группа: А-01-24
Проверил:
Примечание: работа выполнялась на Windows.
1.Создал на рабочем столе каталог lab02 и запустил в нем Git Bash, приглашение:
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02
$
2.Просмотрел файлы в рабочем каталоге можно командой ls — пусто:
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02
$ ls
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02
$
3.Создал каталоги Алисы и Боба, создал каталог project, изучил команду cd в процессе:
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02
$ mkdir alice
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02
$ mkdir bob
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02
$ cd alice
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice
$ mkdir project
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice
$ cd ..
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02
$ cd alice
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice
$ cd project
4. Инициализируем репозитарий в текущем каталоге (project):
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project
$ git init
Initialized empty Git repository in C:/Users/Даниил/Desktop/lab02/alice/proje
ct/.git/
5. Настройка репозитария Алисы:
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (master)
$ git config user.name 'Alice (KantimirovDD)'
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (master)
$ git config user.email 'cassian3907@gmail.com'
6.Создание в CodeBlocks проекта “project“ в репозитарии Алисы.
7.Просмотр состояния рабочей комнаты:
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (master)
$ git status
On branch master
No commits yet
Untracked files:
(use "git add <file>..." to include in what will be committed)
main.cpp
project.cbp
nothing added to commit but untracked files present (use "git add" to track)
8.Добавляем файл main.cpp в индекс:
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (master)
$ git add main.cpp
9.Проверка состояния рабочей копии:
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (master)
$ git status
On branch master
No commits yet
Changes to be committed:
(use "git rm --cached <file>..." to unstage)
new file: main.cpp
Untracked files:
(use "git add <file>..." to include in what will be committed)
project.cbp
10.Выполняем коммит с файлом main.cpp и сообщением:
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (master)
$ git commit -m 'code: заготовка программы'
[master (root-commit) 24796af] code: заготовка программы
1 file changed, 9 insertions(+)
create mode 100644 main.cpp
11.Поменяем имя ветки на main:
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (master)
$ git branch -m main
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (main)
$
12.Добавил файл project.cbp в индекс и создал коммит с ним:
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (main)
$ git add project.cbp
warning: in the working copy of 'project.cbp', LF will be replaced by CRLF th
e next time Git touches it
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (main)
$ git commit -m 'build: добавлен файл проекта'
[main 5b81705] build: добавлен файл проекта
1 file changed, 40 insertions(+)
create mode 100644 project.cbp
13.Проверка состояния репозитария после обновления кода:
Даниил@DESKTOP-98N2NGJ 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")
14.Добавление коммитов и проверка статуса:
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (main)
$ git add main.cpp
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (main)
$ git commit -m 'code: добавлен ввод a и b'
[main f22c6e4] code: добавлен ввод a и b
1 file changed, 3 insertions(+), 2 deletions(-)
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (main)
$ git add main.cpp
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (main)
$ git commit -m 'code: добавлен вывод суммы и разности a и b'
[main 7463fe4] code: добавлен вывод суммы и разности a и b
1 file changed, 2 insertions(+)
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (main)
$ git status
On branch main
Untracked files:
(use "git add <file>..." to include in what will be committed)
bin/
obj/
nothing added to commit but untracked files present (use "git add" to track)
15.Добавление нового файла для игнорирования каталога bin:
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (main)
$ git add .gitignore
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/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)
obj/
project.depend
project.layout
16.Добавление в .gitignore игнорирование файлов obj, *.layout и создание коммита с изменениями:
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (main)
$ git status
On branch main
Changes to be committed:
(use "git restore --staged <file>..." to unstage)
new file: .gitignore
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: .gitignore
Untracked files:
(use "git add <file>..." to include in what will be committed)
project.depend
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (main)
$ git commit -m 'git: игнорирование bin,obj,*.layout'
[main 4f2e82b] git: игнорирование bin,obj,*.layout
1 file changed, 3 insertions(+)
create mode 100644 .gitignore
17.1 Просмотр журнала репозитария:
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (main)
$ git log
commit 4f2e82b17d525af2800a4b2ddec68c2ec30de976 (HEAD -> main)
Author: Alice (KantimirovDD) <cassian3907@gmail.com>
Date: Sun Mar 30 16:45:10 2025 +0300
git: игнорирование bin,obj,*.layout
commit 7463fe4b591ff4633f299cf17d405a915af01c62
Author: Alice (KantimirovDD) <cassian3907@gmail.com>
Date: Sun Mar 30 16:24:42 2025 +0300
code: добавлен вывод суммы и разности a и b
commit f22c6e4dfccef355a6498ca258a236ef63e3105d
Author: Alice (KantimirovDD) <cassian3907@gmail.com>
Date: Sun Mar 30 16:22:17 2025 +0300
code: добавлен ввод a и b
commit 5b817057ee47873c20c3b2a966492194e531a94f
Author: Alice (KantimirovDD) <cassian3907@gmail.com>
Date: Sun Mar 30 16:13:36 2025 +0300
build: добавлен файл проекта
:
17.2 Просмотр файлов изменённых в коммитах:
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (main)
$ git log --stat
commit 4f2e82b17d525af2800a4b2ddec68c2ec30de976 (HEAD -> main)
Author: Alice (KantimirovDD) <cassian3907@gmail.com>
Date: Sun Mar 30 16:45:10 2025 +0300
git: игнорирование bin,obj,*.layout
.gitignore | 3 +++
1 file changed, 3 insertions(+)
commit 7463fe4b591ff4633f299cf17d405a915af01c62
Author: Alice (KantimirovDD) <cassian3907@gmail.com>
Date: Sun Mar 30 16:24:42 2025 +0300
code: добавлен вывод суммы и разности a и b
main.cpp | 2 ++
1 file changed, 2 insertions(+)
commit f22c6e4dfccef355a6498ca258a236ef63e3105d
Author: Alice (KantimirovDD) <cassian3907@gmail.com>
Date: Sun Mar 30 16:22:17 2025 +0300
code: добавлен ввод a и b
17.3 Просмотр коммитов компактно:
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (main)
$ git log --oneline --decorate
4f2e82b (HEAD -> main) git: игнорирование bin,obj,*.layout
7463fe4 code: добавлен вывод суммы и разности a и b
f22c6e4 code: добавлен ввод a и b
5b81705 build: добавлен файл проекта
24796af code: заготовка программы
17.4 Просмотр коммитов деревом:
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (main)
$ git log --oneline --decorate --all --graph
* 4f2e82b (HEAD -> main) git: игнорирование bin,obj,*.layout
* 7463fe4 code: добавлен вывод суммы и разности a и b
* f22c6e4 code: добавлен ввод a и b
* 5b81705 build: добавлен файл проекта
* 24796af code: заготовка программы
17.5 Просмотр коммитов затрагивающих main.cpp
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (main)
$ git log -- main.cpp
commit 7463fe4b591ff4633f299cf17d405a915af01c62
Author: Alice (KantimirovDD) <cassian3907@gmail.com>
Date: Sun Mar 30 16:24:42 2025 +0300
code: добавлен вывод суммы и разности a и b
commit f22c6e4dfccef355a6498ca258a236ef63e3105d
Author: Alice (KantimirovDD) <cassian3907@gmail.com>
Date: Sun Mar 30 16:22:17 2025 +0300
code: добавлен ввод a и b
commit 24796af26a70c41696be0261edd186ba95d080d8
Author: Alice (KantimirovDD) <cassian3907@gmail.com>
Date: Sun Mar 30 16:08:46 2025 +0300
code: заготовка программы
17.6 Просмотр коммитов с code: в сообщение:
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (main)
$ git log --grep "code:"
commit 7463fe4b591ff4633f299cf17d405a915af01c62
Author: Alice (KantimirovDD) <cassian3907@gmail.com>
Date: Sun Mar 30 16:24:42 2025 +0300
code: добавлен вывод суммы и разности a и b
commit f22c6e4dfccef355a6498ca258a236ef63e3105d
Author: Alice (KantimirovDD) <cassian3907@gmail.com>
Date: Sun Mar 30 16:22:17 2025 +0300
code: добавлен ввод a и b
commit 24796af26a70c41696be0261edd186ba95d080d8
Author: Alice (KantimirovDD) <cassian3907@gmail.com>
Date: Sun Mar 30 16:08:46 2025 +0300
code: заготовка программы
17.7 Просмотр коммитов по теме build и затрагивающие project.cbp:
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (main)
$ git log -- project.cbp
commit 5b817057ee47873c20c3b2a966492194e531a94f
Author: Alice (KantimirovDD) <cassian3907@gmail.com>
Date: Sun Mar 30 16:13:36 2025 +0300
build: добавлен файл проекта
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (main)
$ git log --grep "build:"
commit 5b817057ee47873c20c3b2a966492194e531a94f
Author: Alice (KantimirovDD) <cassian3907@gmail.com>
Date: Sun Mar 30 16:13:36 2025 +0300
build: добавлен файл проекта
18.1 Просмотр предпоследнего коммитов:
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (main)
$ git show HEAD~1
commit 7463fe4b591ff4633f299cf17d405a915af01c62
Author: Alice (KantimirovDD) <cassian3907@gmail.com>
Date: Sun Mar 30 16:24:42 2025 +0300
code: добавлен вывод суммы и разности a и b
diff --git a/main.cpp b/main.cpp
index b903969..c3d4222 100644
--- a/main.cpp
+++ b/main.cpp
@@ -7,4 +7,6 @@ int main()
cout << "Enter A and B: ";
int a, b;
cin >> a >> b;
+cout << "A + B = " << a + b << '\n'
+ << "A - B = " << a - b << '\n';
}
18.2 Просмотр предпоследнего коммита с помощью хэша
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (main)
$ git show 7463fe4b591ff4633f299cf17d405a915af01c62
commit 7463fe4b591ff4633f299cf17d405a915af01c62
Author: Alice (KantimirovDD) <cassian3907@gmail.com>
Date: Sun Mar 30 16:24:42 2025 +0300
code: добавлен вывод суммы и разности a и b
diff --git a/main.cpp b/main.cpp
index b903969..c3d4222 100644
--- a/main.cpp
+++ b/main.cpp
@@ -7,4 +7,6 @@ int main()
cout << "Enter A and B: ";
int a, b;
cin >> a >> b;
+cout << "A + B = " << a + b << '\n'
+ << "A - B = " << a - b << '\n';
}
19. Просмотр изменений без коммита:
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (main)
$ git diff
diff --git a/main.cpp b/main.cpp
index c3d4222..110af4d 100644
--- a/main.cpp
+++ b/main.cpp
@@ -8,5 +8,6 @@ cout << "Enter A and B: ";
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';
}
20. Просмотр изменений между самым первым коммитом
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (main)
$ 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 b903969..c3d4222 100644
--- a/main.cpp
+++ b/main.cpp
@@ -7,4 +7,6 @@ int main()
cout << "Enter A and B: ";
int a, b;
cin >> a >> b;
+cout << "A + B = " << a + b << '\n'
+ << "A - B = " << a - b << '\n';
}
21. Создание коммита с произведением
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (main)
$ git add main.cpp
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (main)
$ git commit -m 'code: Вывод произведения'
[main 12ec582] code: Вывод произведения
1 file changed, 2 insertions(+), 1 deletion(-)
22. Откат коммита на один назад
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (main)
$ git reset --hard HEAD~1
HEAD is now at 4f2e82b git: игнорирование bin,obj,*.layout
23.Еще один способ отката
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (main)
$ git checkout HEAD -- main.cpp
24. Создание ключей и регистрация на сайте
Даниил@DESKTOP-98N2NGJ 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\224\320\260\320\275\320\270\320\270\320\273/.ssh'.
Enter passphrase for "/c/Users/Даниил/.ssh/id_ed25519" (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:9VuW99e9qDPOCI4i4oxAW+lGwXlyYi8XuJeZdJCLPPg Даниил@DESKTOP-98N2NGJ
The key's randomart image is:
+--[ED25519 256]--+
| .. |
| . o.. |
| oO.=.. . |
| ..+@.* . . . |
| ..*.B S . + .|
|. =E+ + .+|
|.. o . . =|
|=... o . oo . o|
|+o. .. . ..++. . |
+----[SHA256]-----+
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (main)
$ eval $(ssh-agent -s)
Agent pid 690
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (main)
$ ssh-add
Identity added: /c/Users/Даниил/.ssh/id_ed25519 (Даниил@DESKTOP-98N2NGJ)
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (main)
$ cat ~/.ssh/id_ed25519.pub
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEj6WrOzsrsZGYauJ57T5NF34KIHI9nTPLD/bvAjcFGx Даниил@DESKTOP-98N2NGJ
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (main)
$ touch README.md
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (main)
$ git init
Reinitialized existing Git repository in C:/Users/Даниил/Desktop/lab02/alice/pro
ject/.git/
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (main)
$ git checkout -b main
fatal: a branch named 'main' already exists
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (main)
$ git add README.md
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (main)
$ git commit -m "first commit"
[main 0619470] first commit
1 file changed, 0 insertions(+), 0 deletions(-)
create mode 100644 README.md
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (main)
$ git remote add origin git@uit.mpei.ru:KantimirovDD/cs-lab02.git
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (main)
$ git push -u origin main
The authenticity of host 'uit.mpei.ru (193.233.68.149)' can't be established.
ED25519 key fingerprint is SHA256:Q5w0UKEzQKA3J6NyMtjwCLvtAykoxdugIXjx6NwU4NA.
This key is not known by any other names.
Are you sure you want to continue connecting (yes/no/[fingerprint])? yes
Warning: Permanently added 'uit.mpei.ru' (ED25519) to the list of known hosts.
Enumerating objects: 18, done.
Counting objects: 100% (18/18), done.
Delta compression using up to 8 threads
Compressing objects: 100% (15/15), done.
Writing objects: 100% (18/18), 2.29 KiB | 167.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 uit.mpei.ru:KantimirovDD/cs-lab02.git
* [new branch] main -> main
branch 'main' set up to track 'origin/main'.
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (main)
$ git remote -v
origin git@uit.mpei.ru:KantimirovDD/cs-lab02.git (fetch)
origin git@uit.mpei.ru:KantimirovDD/cs-lab02.git (push)
25.Создание боба
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/bob
$ git clone git@uit.mpei.ru:KantimirovDD/cs-lab02.git project
Cloning into 'project'...
remote: Enumerating objects: 18, done.
remote: Counting objects: 100% (18/18), done.
remote: Compressing objects: 100% (15/15), done.
remote: Total 18 (delta 2), reused 0 (delta 0), pack-reused 0
Receiving objects: 100% (18/18), 2.29 KiB | 335.00 KiB/s, done.
Resolving deltas: 100% (2/2), done.
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/bob
$ cd project
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/bob/project (main)
$ git config user.name 'Bob (KantimirovDD)'
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/bob/project (main)
$ git config user.email 'cassian3907@gmail.com'
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/bob/project (main)
$ git add -u
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/bob/project (main)
$ git commit -m 'code: Произведение'
[main 18badd6] code: Произведение
1 file changed, 2 insertions(+), 1 deletion(-)
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/bob/project (main)
$ git show HEAD
commit 18badd66a66bcd14a6acb43ddf54fec83c80f32a (HEAD -> main)
Author: Bob (KantimirovDD) <cassian3907@gmail.com>
Date: Sun Apr 6 14:19:56 2025 +0300
code: Произведение
diff --git a/main.cpp b/main.cpp
index c3d4222..110af4d 100644
--- a/main.cpp
+++ b/main.cpp
@@ -8,5 +8,6 @@ cout << "Enter A and B: ";
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';
}
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/bob/project (main)
$ git push
Enumerating objects: 5, done.
Counting objects: 100% (5/5), done.
Delta compression using up to 8 threads
Compressing objects: 100% (3/3), done.
Writing objects: 100% (3/3), 355 bytes | 355.00 KiB/s, done.
Total 3 (delta 2), reused 0 (delta 0), pack-reused 0 (from 0)
remote: . Processing 1 references
remote: Processed 1 references in total
To uit.mpei.ru:KantimirovDD/cs-lab02.git
0619470..18badd6 main -> main
26.Добавление изменений на алису
Даниил@DESKTOP-98N2NGJ 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 2), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (3/3), 335 bytes | 41.00 KiB/s, done.
From uit.mpei.ru:KantimirovDD/cs-lab02
0619470..18badd6 main -> origin/main
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (main)
$ git log --oneline --decorate --all --graph
* 18badd6 (origin/main, origin/HEAD) code: Произведение
* 0619470 (HEAD -> main) first commit
* 4f2e82b git: игнорирование bin,obj,*.layout
* 7463fe4 code: добавлен вывод суммы и разности a и b
* f22c6e4 code: добавлен ввод a и b
* 5b81705 build: добавлен файл проекта
* 24796af code: заготовка программы
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (main)
$ git pull --ff-only
Updating 0619470..18badd6
Fast-forward
main.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (main)
$ git log --oneline --decorate --all --graph
* 18badd6 (HEAD -> main, origin/main, origin/HEAD) code: Произведение
* 0619470 first commit
* 4f2e82b git: игнорирование bin,obj,*.layout
* 7463fe4 code: добавлен вывод суммы и разности a и b
* f22c6e4 code: добавлен ввод a и b
* 5b81705 build: добавлен файл проекта
* 24796af code: заготовка программы
27.Добавление деления и загрузка на сервер
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (main)
$ git add -u
warning: in the working copy of 'project.cbp', LF will be replaced by CRLF the next time Git touches it
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (main)
$ git commit -m 'Code: Деление'
[main 04a2949] Code: Деление
2 files changed, 3 insertions(+), 1 deletion(-)
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (main)
$ git push
Enumerating objects: 7, done.
Counting objects: 100% (7/7), done.
Delta compression using up to 8 threads
Compressing objects: 100% (4/4), done.
Writing objects: 100% (4/4), 490 bytes | 245.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:KantimirovDD/cs-lab02.git
18badd6..04a2949 main -> main
28.Добавление бобом изменений
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/bob/project (main)
$ git fetch
remote: Enumerating objects: 7, done.
remote: Counting objects: 100% (7/7), done.
remote: Compressing objects: 100% (4/4), done.
remote: Total 4 (delta 2), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (4/4), 470 bytes | 33.00 KiB/s, done.
From uit.mpei.ru:KantimirovDD/cs-lab02
18badd6..04a2949 main -> origin/main
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/bob/project (main)
$ git log --oneline --decorate --all --graph
* 04a2949 (origin/main, origin/HEAD) Code: Деление
* 18badd6 (HEAD -> main) code: Произведение
* 0619470 first commit
* 4f2e82b git: игнорирование bin,obj,*.layout
* 7463fe4 code: добавлен вывод суммы и разности a и b
* f22c6e4 code: добавлен ввод a и b
* 5b81705 build: добавлен файл проекта
* 24796af code: заготовка программы
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/bob/project (main)
$ git pull --ff-only
Updating 18badd6..04a2949
Fast-forward
main.cpp | 3 ++-
project.cbp | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/bob/project (main)
$ git log --oneline --decorate --all --graph
* 04a2949 (HEAD -> main, origin/main, origin/HEAD) Code: Деление
* 18badd6 code: Произведение
* 0619470 first commit
* 4f2e82b git: игнорирование bin,obj,*.layout
* 7463fe4 code: добавлен вывод суммы и разности a и b
* f22c6e4 code: добавлен ввод a и b
* 5b81705 build: добавлен файл проекта
* 24796af code: заготовка программы
29.Добавление алисой максимума
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (main)
$ git add -u
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (main)
$ git commit -m 'Code: max'
[main 06de502] Code: max
1 file changed, 2 insertions(+), 1 deletion(-)
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (main)
$ git push
Enumerating objects: 5, done.
Counting objects: 100% (5/5), done.
Delta compression using up to 8 threads
Compressing objects: 100% (3/3), done.
Writing objects: 100% (3/3), 339 bytes | 339.00 KiB/s, done.
Total 3 (delta 2), reused 0 (delta 0), pack-reused 0 (from 0)
remote: . Processing 1 references
remote: Processed 1 references in total
To uit.mpei.ru:KantimirovDD/cs-lab02.git
04a2949..06de502 main -> main
30.Добавление бобом минимума и конфликт
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/bob/project (main)
$ git add -u
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/bob/project (main)
$ git commit -m 'code: min'
[main aaf838a] code: min
1 file changed, 3 insertions(+), 1 deletion(-)
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/bob/project (main)
$ git push
To uit.mpei.ru:KantimirovDD/cs-lab02.git
! [rejected] main -> main (fetch first)
error: failed to push some refs to 'uit.mpei.ru:KantimirovDD/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.
Даниил@DESKTOP-98N2NGJ 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 2), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (3/3), 319 bytes | 29.00 KiB/s, done.
From uit.mpei.ru:KantimirovDD/cs-lab02
04a2949..06de502 main -> origin/main
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/bob/project (main)
$ git log --oneline --decorate --all --graph
* aaf838a (HEAD -> main) code: min
| * 06de502 (origin/main, origin/HEAD) Code: max
|/
* 04a2949 Code: Деление
* 18badd6 code: Произведение
* 0619470 first commit
* 4f2e82b git: игнорирование bin,obj,*.layout
* 7463fe4 code: добавлен вывод суммы и разности a и b
* f22c6e4 code: добавлен ввод a и b
* 5b81705 build: добавлен файл проекта
* 24796af code: заготовка программы
Даниил@DESKTOP-98N2NGJ 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 aaf838a... code: min
code: min
code: min
# Conflicts:
# main.cpp
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# interactive rebase in progress; onto 06de502
# Last command done (1 command done):
# pick aaf838a code: min
# No commands remaining.
# You are currently rebasing branch 'main' on '06de502'.
#
# Changes to be committed:
# modified: main.cpp
#
'code: решение конфликта'
~
~
~
~
~
~
~
.git/COMMIT_EDITMSG[+] [unix] (14:41 06/04/2025) 17,1 All
[detached HEAD f106b13] code: min
1 file changed, 2 insertions(+), 1 deletion(-)
Successfully rebased and updated refs/heads/main.
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/bob/project (main)
$ git log --oneline --decorate --all --graph
* f106b13 (HEAD -> main) code: min
* 06de502 (origin/main, origin/HEAD) Code: max
* 04a2949 Code: Деление
* 18badd6 code: Произведение
* 0619470 first commit
* 4f2e82b git: игнорирование bin,obj,*.layout
* 7463fe4 code: добавлен вывод суммы и разности a и b
* f22c6e4 code: добавлен ввод a и b
* 5b81705 build: добавлен файл проекта
* 24796af code: заготовка программы
31. Добавление новой ветки
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (main)
$ git branch double
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (main)
$ git checkout double
Switched to branch 'double'
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (double)
$ git add -u
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (double)
$ git commit -m 'Code: double'
[double 1428d55] Code: double
1 file changed, 1 insertion(+), 1 deletion(-)
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (double)
$ git checkout main
Switched to branch 'main'
Your branch is up to date with 'origin/main'.
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (main)
$ git fetch
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (main)
$ git log --oneline --decorate --all --graph
* 1428d55 (double) Code: double
* 06de502 (HEAD -> main, origin/main, origin/HEAD) Code: max
* 04a2949 Code: Деление
* 18badd6 code: Произведение
* 0619470 first commit
* 4f2e82b git: игнорирование bin,obj,*.layout
* 7463fe4 code: добавлен вывод суммы и разности a и b
* f22c6e4 code: добавлен ввод a и b
* 5b81705 build: добавлен файл проекта
* 24796af code: заготовка программы
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (main)
$ git merge double
Updating 06de502..1428d55
Fast-forward
main.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Даниил@DESKTOP-98N2NGJ MINGW64 ~/Desktop/lab02/alice/project (main)
$ git log --oneline --decorate --all --graph
* 1428d55 (HEAD -> main, double) Code: double
* 06de502 (origin/main, origin/HEAD) Code: max
* 04a2949 Code: Деление
* 18badd6 code: Произведение
* 0619470 first commit
* 4f2e82b git: игнорирование bin,obj,*.layout
* 7463fe4 code: добавлен вывод суммы и разности a и b
* f22c6e4 code: добавлен ввод a и b
* 5b81705 build: добавлен файл проекта
* 24796af code: заготовка программы