PakhomovaAY
/
cs-lab02
1
0
Форкнуть 0
Код Задачи Запросы на слияние Пакеты Проекты Релизы Вики Активность

Загрузил(а) файлы в ''

Просмотр исходного кода
main
PakhomovaAY 4 недель назад
Родитель befc2a35f3
Сommit 39a9c26c15
1 изменённых файлов: 906 добавлений и 0 удалений
Показать статистику Скачать Patch файл Скачать Diff файл

906
отчёт1.txt
Unescape Просмотреть файл

@ -0,0 +1,906 @@
Ôåäåðàëüíîå ãîñóäàðñòâåííîå áþäæåòíîå îáðàçîâàòåëüíîå ó÷ðåæäåíèå âûñøåãî îáðàçîâàíèÿ «Íàöèîíàëüíûé èññëåäîâàòåëüñêèé óíèâåðñèòåò «ÌÝÈ»
Èíñòèòóò èíôîðìàöèîííûõ è âû÷èñëèòåëüíûõ òåõíîëîãèé
Êàôåäðà Óïðàâëåíèÿ è èíòåëëåêòóàëüíûõ òåõíîëîãèé
Äèñöèïëèíà:
Ðàçðàáîòêà ïðîãðàììíîãî îáåñïå÷åíèÿ ñèñòåì óïðàâëåíèÿ
Ëàáîðàòîðíàÿ ðàáîòà ¹2
Ñèñòåìà êîíòðîëÿ âåðñèé Git
Âûïîëíèë ñòóäåíò ãðóïïû
À-03-24
Ïàõîìîâà Àííà Þðüåâíà
Âàðèàíò: -
Ïðîâåðèë
Êîçëþê Äìèòðèé Àëåêñàíäðîâè÷
Ìîñêâà 2025
* Âõîä â òåðìèíàë è ñîçäàíèå ñòðóêòóðû êàòàëîãîâ
1. Ñîçäàëà íà ðàáî÷åì ñòîëå êàòàëîã lab02 è çàïóñòèë â íåì Git Bash, ïðèãëàøåíèå:
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02
$
2. Ïîñìîòðåëà ôàéëû â ðàáî÷åì êàòàëîãå êîìàíäîé ls – ïóñòî:
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02
$ ls
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02
$
3. Ñîçäàëà êàòàëîãè Àëèñû è Áîáà, èçó÷èëà êîìàíäó cd â ïðîöåññå:
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02 $ mkdir alice user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02 $ mkdir bob user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02 $ cd alice
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice
$ mkdir project
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice
$ cd project
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project
$ cd ..
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice
$ cd project
* Èíèöèàëèçàöèÿ ðåïîçèòàðèÿ è íàñòðîéêà Git
4. Èíèöèàëèçèðîâàëà õðàíèëèùå git
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project
$ git init
Initialized empty Git repository in C:/Users/user/Desktop/lab02/alice/project/.git/
5. Íàñòðîèëà ðåïîçèòàðèé Àëèñû
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (master)
$ git config user.name 'Alice (PakhomovaAY)'
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (master)
$ git config user.email 'PakhomovaAY@mpei.ru'
* Çàíåñåíèå ôàéëîâ ïîä êîíòðîëü âåðñèé
6. Ïîñìîòðåëà ñîñòîÿíèå ðàáî÷åé êîïèè
user@WIN-PNK03JICHSD 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)
bin/
main.cpp
obj/
project.cbp
nothing added to commit but untracked files present (use "git add" to track)
1 ñòðîêà: óêàçûâàåò íà âåòêó
2 ñòðîêà: ãîâîðèò î òîì, ÷òî åùå íå áûëî ñîçäàíî êîììèòîâ
3 ñòðîêà: ïîêàçûâàåò íå îòñëåæèâàåìûå ôàéëû â õðàíèëèùå git, è ïîäñêàçûâàåò êàê èõ äîáàâèòü
4 ñòðîêà: ãîâîðèò î òîì, ÷òî íåò îòñëåæèâàåìûõ ôàéëîâ, êîòîðûå ìîæíî áóäåò çàêîììèòèòü
7. Íà÷àëà îòñëåæèâàòü main.cpp (çàíåñëà ïîä git)
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (master)
$ git add main.cpp
8. Ïîñìîòðåëà ñîñòîÿíèå ðàáî÷åé êîïèè
user@WIN-PNK03JICHSD 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)
bin/
obj/
project.cbp
Ïîÿâèëàñü ñòðîêà ñ ôàéëîì, êîòîðûé ìîæíî çàêîììèòèòü, ò.ê. ìû íà÷àëè åãî îòñëåæèâàòü.
9. Ñîçäàëà êîììèò
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (master)
$ git commit -m 'code: çàãîòîâêà ïðîãðàììû'
[master (root-commit) 6799c67] code: çàãîòîâêà ïðîãðàììû
1 file changed, 9 insertions(+)
create mode 100644 main.cpp
10. Ïîìåíÿëà íàçâàíèå âåòêè íà main
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (master)
$ git branch -m main
* Ñîñòàâëåíèå ñîîáùåíèé ê êîììèòàì
11. Çàíåñëà ïîä git project.cbp
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (main)
$ git add project.cbp
12. Ñîçäàëà êîììèò
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (main)
$ git commit -m 'build: äîáàâëåí ôàéë ïðîåêòà'
[main 97097c1] build: äîáàâëåí ôàéë ïðîåêòà
1 file changed, 40 insertions(+)
create mode 100644 project.cbp
* Ñîçäàíèå êîììèòîâ ñ èçìåíåíèÿìè
13. Ïîñìîòðåëà ñîñòîÿíèå ïîñëå çàìåíû íà ââîä äâóõ ÷èñåë
user@WIN-PNK03JICHSD 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. Ñäåëàëà êîììèòû 3 ðàçíûìè ñïîñîáàìè:
À) Âûáðàëà ôàéë, èçìåíåíèÿ êîòîðîãî äîëæíû âîéòè â êîììèò, çàòåì ñäåëàëà êîììèò:
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (main)
$ git add main.cpp
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (main)
$ git commit -m 'code; äîáàâëåí ââîä äâóõ ÷èñåë'
[main 9edb922] code; äîáàâëåí ââîä äâóõ ÷èñåë
1 file changed, 3 insertions(+), 1 deletion(-)
Á) Äîáàâèëà â èíäåêñ âñå èçìåíåíèÿ, çàòåì ñäåëàëà êîììèò:
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (main)
$ git add -u
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (main)
$ git commit -m 'code: äîáàâëåí âûâîä ñóììû äâóõ ÷èñåë'
[main 727239e] code: äîáàâëåí âûâîä ñóììû äâóõ ÷èñåë
1 file changed, 2 insertions(+)
Â) Äîáàâèëà âñå èçìåíåíèÿ â èíäåêñ è ñäåëàòü êîììèò â îäèí øàã:
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (main)
$ git commit -a -m "code: äîáàâëåí âûâîä ðàçíîñòè äâóõ ÷èñåë"
[master 1881621] code: äîáàâëåí âûâîä ðàçíîñòè äâóõ ÷èñåë
1 file changed, 2 insertions(+), 1 deletion(-)
* Èãíîðèðîâàíèå ôàéëîâ
15. Ñîçäàëà ôàéë gitignore è ñäåëàëà êîììèò:
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (main)
$ git status
On branch master
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)
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (main)
$ git add .gitignore
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (main)
$ git commit -m 'git: äîáàâëåíî èãíîðèðîâàíèå ôàéëîâ'
[master 5d5062e] git: äîáàâëåíî èãíîðèðîâàíèå ôàéëîâ
1 file changed, 2 insertions(+)
create mode 100644 .gitignore
* Ðàáîòà ñ æóðíàëîì ðåïîçèòàðèÿ
16. Ïîñìîòðåëà æóðíàë ðåïîçèòàðèÿ 3 ñïîñîáàìè:
À) git log –stat
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (main)
$ git log --stat
commit 3ed003b3b82c5a453adbc17304f6bcb45045b4a4 (HEAD -> main)
Author: Alice (PakhomovaAY) <PakhomovaAY@mpei.ru>
Date: Sun Mar 30 15:14:59 2025 +0300
git: äîáàâëåíî èãíîðèðîâàíèå ôàéëîâ
.gitignore | 2 ++
1 file changed, 2 insertions(+)
commit 1881621d244e085c2787531616f4ecb8dc762941
Author: Alice (PakhomovaAY) <PakhomovaAY@mpei.ru>
Date: Sun Mar 30 15:12:08 2025 +0300
code: äîáàâëåí âûâîä ðàçíîñòè äâóõ ÷èñåë
main.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
commit 727239e04eab296019265b2627bbe1e3698da4ba
Author: Alice (PakhomovaAY) <PakhomovaAY@mpei.ru>
Date: Sun Mar 30 15:11:21 2025 +0300
code: äîáàâëåí âûâîä ñóììû äâóõ ÷èñåë
main.cpp | 2 ++
1 file changed, 2 insertions(+)
commit 9edb9229800acf69d67038b3adcc7b0943bf52b0
Author: Alice (PakhomovaAY) <PakhomovaAY@mpei.ru>
Date: Sun Mar 30 15:09:12 2025 +0300
code; äîáàâëåí ââîä äâóõ ÷èñåë
main.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
commit 97097c1fc03b1234eb4277b6770f14a384341f89
Author: Alice (PakhomovaAY) <PakhomovaAY@mpei.ru>
Date: Sun Mar 30 15:06:18 2025 +0300
build: äîáàâëåí ôàéë ïðîåêòà
project.cbp | 40 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)
commit 6799c6741e8f61190e6e6d19d28579a571c0862a
Author: Alice (PakhomovaAY) <PakhomovaAY@mpei.ru>
Date: Sun Mar 30 15:04:47 2025 +0300
code: çàãîòîâêà ïðîãðàììû
main.cpp | 9 +++++++++
1 file changed, 9 insertions(+)
Äëÿ ïîñëåäíåãî êîììèòà ïîêàçûâàåòñÿ åãî õýø; àâòîð; äàòà; ñàì êîììèò; ïåðå÷èñëåíèå ôàéëîâ, â êîòîðûõ ïðîèçîøëè èçìåíåíèÿ è êîë-âî èçìåíåííûõ ñòðî÷åê(“+” äîáàâëåííàÿ ñòð., “-” óäàëåííàÿ ñòð.).
 ïîñëåäíåé ñòð. ïðèâåäåíà ñòàòèñòèêà èçìåíåíèé äàííûõ ôàéëîâ.
Á) git log --oneline --decorate
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (main)
$ git log --oneline --decorate
3ed003b (HEAD -> main) git: äîáàâëåíî èãíîðèðîâàíèå ôàéëîâ
1881621 code: äîáàâëåí âûâîä ðàçíîñòè äâóõ ÷èñåë
727239e code: äîáàâëåí âûâîä ñóììû äâóõ ÷èñåë
9edb922 code; äîáàâëåí ââîä äâóõ ÷èñåë
97097c1 build: äîáàâëåí ôàéë ïðîåêòà
6799c67 code: çàãîòîâêà ïðîãðàììû
Â) git log --oneline --decorate --all --graph
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (main)
$ git log --oneline --decorate --all --graph
* 3ed003b (HEAD -> main) git: äîáàâëåíî èãíîðèðîâàíèå ôàéëîâ
* 1881621 code: äîáàâëåí âûâîä ðàçíîñòè äâóõ ÷èñåë
* 727239e code: äîáàâëåí âûâîä ñóììû äâóõ ÷èñåë
* 9edb922 code; äîáàâëåí ââîä äâóõ ÷èñåë
* 97097c1 build: äîáàâëåí ôàéë ïðîåêòà
* 6799c67 code: çàãîòîâêà ïðîãðàììû
17. Ïîèñê êîììèòîâ ïî òåìå build:
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (main)
$ git log --grep "build:"
commit 97097c1fc03b1234eb4277b6770f14a384341f89
Author: Alice (PakhomovaAY) <PakhomovaAY@mpei.ru>
Date: Sun Mar 30 15:06:18 2025 +0300
build: äîáàâëåí ôàéë ïðîåêòà
18. Ïîèñê êîììèòîâ, çàòðàãèâàþùèõ project.cbp
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (main)
$ git log -- project.cbp
commit 97097c1fc03b1234eb4277b6770f14a384341f89
Author: Alice (PakhomovaAY) <PakhomovaAY@mpei.ru>
Date: Sun Mar 30 15:06:18 2025 +0300
build: äîáàâëåí ôàéë ïðîåêòà
* Ïðîñìîòð êîììèòîâ
19. Ïîñìîòðåëà ïðåäïîñëåäíèé êîììèò
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (main)
$ git show HEAD~1
commit 1881621d244e085c2787531616f4ecb8dc762941
Author: Alice (PakhomovaAY) <PakhomovaAY@mpei.ru>
Date: Sun Mar 30 15:12:08 2025 +0300
code: äîáàâëåí âûâîä ðàçíîñòè äâóõ ÷èñåë
diff --git a/main.cpp b/main.cpp
index dec99f2..9bade74 100644
--- a/main.cpp
+++ b/main.cpp
@@ -7,7 +7,8 @@ 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;
}
* Ïðîñìîòð èçìåíåíèé
20. Ïðîñìîòðåëà èçìåíåíèÿ â ðàáî÷åé êîïèè:
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (main)
$ git diff
diff --git a/main.cpp b/main.cpp
index 9bade74..15a93c2 100644
--- a/main.cpp
+++ b/main.cpp
@@ -8,7 +8,8 @@ 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;
}
1 ñòðîêà. Óêàçûâàåò, ÷òî ñðàâíèâàþòñÿ äâå âåðñèè ôàéëà main.cpp
2 ñòðîêà. Õåøè ñîñòîÿíèÿ ôàéëîâ äî è ïîñëå èçìåíåíèé.
3 ñòðîêà. Ñòàðàÿ âåðñèÿ ôàéëà.
4 ñòðîêà. Íîâàÿ âåðñèÿ ôàéëà.
5 ñòðîêà. -8,7 îçíà÷àåò, ÷òî ðàíüøå áëîê êîäà çàíèìàë 7 ñòðîê, à òåïåðü çàíèìàåò 8. Èçìåíåíèå ïðîèçîøëî â ôàéëå íà÷èíàÿ ñ 8-é ñòðîêè.
Äàëåå èäåò êîä è óäàëåííûå è äîáàâëåííûå ñòðîêè.
21. Ïðîñìîòðåëà èçìåíåíèÿ ìåæäó ñàìûì ïåðâûì êîììèòîì è êîììèòîì, äîáàâëÿþùèì âûâîä ðàçíîñòè.
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (main)
$ git diff HEAD~5 HEAD~1
diff --git a/main.cpp b/main.cpp
index b4392ec..9bade74 100644
--- a/main.cpp
+++ b/main.cpp
@@ -4,6 +4,11 @@ using namespace std;
int main()
{
- cout << "Hello world!" << endl;
+ cout << "Enter A and B: ";
+ int a, b;
+ cin >> a >> b;
+ cout << "A + B = " << a + b << '\n'
+ << "A - B = " << a - b << '\n';
+
return 0;
}
diff --git a/project.cbp b/project.cbp
new file mode 100644
index 0000000..99bb702
--- /dev/null
+++ b/project.cbp
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_project_file>
+ <FileVersion major="1" minor="6" />
+ <Project>
+ <Option title="project" />
+ <Option pch_mode="2" />
+ <Option compiler="gcc" />
+ <Build>
+ <Target title="Debug">
+ <Option output="bin/Debug/project" prefix_auto="1" extension_auto="1" />
+ <Option object_output="obj/Debug/" />
+ <Option type="1" />
+ <Option compiler="gcc" />
+ <Compiler>
+ <Add option="-g" />
+ </Compiler>
+ </Target>
+ <Target title="Release">
+ <Option output="bin/Release/project" prefix_auto="1" extension_auto="1" />
+ <Option object_output="obj/Release/" />
+ <Option type="1" />
+ <Option compiler="gcc" />
+ <Compiler>
+ <Add option="-O2" />
+ </Compiler>
+ <Linker>
+ <Add option="-s" />
+ </Linker>
+ </Target>
+ </Build>
+ <Compiler>
+ <Add option="-Wall" />
+ <Add option="-fexceptions" />
+ </Compiler>
+ <Unit filename="main.cpp" />
+ <Extensions>
+ <lib_finder disable_auto="1" />
+ </Extensions>
+ </Project>
+</CodeBlocks_project_file>
* Îòêàò èçìåíåíèé
22. Çàêîììèòèëà âûâîä ïðîèçâåäåíèÿ.
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (main)
$ git commit -a -m "code: äîáàâëåí âûâîä ïðîèçâåäåíèÿ"
[main f559a6e] code: äîáàâëåí âûâîä ïðîèçâåäåíèÿ
1 file changed, 2 insertions(+), 1 deletion(-)
23. Ñäåëàëà îòêàò êîììèòà ê ñîñòîÿíèþ â ïîñëåäíåì êîììèòå.
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (main)
$ git reset --hard HEAD~1
HEAD is now at 3ed003b git: äîáàâëåíî èãíîðèðîâàíèå ôàéëîâ
Äàëåå äîáàâèëà êîììåíòàðèé â êîäå. Êîììèò íå áûë ñäåëàí.
24. Ñäåëàëà îòêàò èçìåíåíèé äðóãèì ñïîñîáîì (ê ñîñòîÿíèþ â ïîñëåäíåì êîììèòå).
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (main)
$ git checkout HEAD -- main.cpp
Ýòèì ñïîñîáîì ìîæíî îòêàòûâàòü èçìåíåíèÿ îòäåëüíûõ ôàéëîâ.
* Îáìåí êîäîì ÷åðåç óäàëåííîå õðàíèëèùå
25. Ñîçäàíèå ïàðû êëþ÷åé
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (main)
$ ssh-keygen
Generating public/private ed25519 key pair.
Enter file in which to save the key (/c/Users/user/.ssh/id_ed25519):
/c/Users/user/.ssh/id_ed25519 already exists.
Overwrite (y/n)? y
Enter passphrase for "/c/Users/user/.ssh/id_ed25519" (empty for no passphrase):
Enter same passphrase again:
Your identification has been saved in /c/Users/user/.ssh/id_ed25519
Your public key has been saved in /c/Users/user/.ssh/id_ed25519.pub
The key fingerprint is:
SHA256:DOa8849gHMrX6niEf2kcQdrz40/6NwnWEvwuDecEyw8 user@WIN-PNK03JICHSD
The key's randomart image is:
+--[ED25519 256]--+
| |
| . |
| o+ . |
| +.o+ + |
| .+ S+ . * |
| ..o.+. o E = |
| ooB..+ o.% . |
| +o==..o. O |
| .oooo.oooo . |
+----[SHA256]-----+
26. Çàïóñòèëà àãåíò.
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (main)
$ eval $(ssh-agent -s)
Agent pid 1999
27. Çàãðóçèëà êëþ÷
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (main)
$ ssh-add
Enter passphrase for /c/Users/user/.ssh/id_ed25519:
Identity added: /c/Users/user/.ssh/id_ed25519 (user@WIN-PNK03JICHSD)
28. Îòîáðàçèëà êëþ÷:
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (main)
$ cat ~/.ssh/id_ed25519.pub
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICLtxIDO4cP1TH3nE0pHmm5F3zoR19lTtuOLBFKYHoml user@WIN-PNK03JICHSD
29. Íàñòðîéêà ñâÿçè ñ óäàëåííûì õðàíèëèùåì:
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (main)
$ git remote add origin git@uit.mpei.ru:PakhomovaAY/cs-lab02.git
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (main)
$ git push -u origin main
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.39 KiB | 612.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:PakhomovaAY/cs-lab02.git
* [new branch] main -> main
branch 'main' set up to track 'origin/main'.
30. Îòîáðàçèëà àäðåñ ïðîåêòà:
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (main)
$ git remote -v
origin git@uit.mpei.ru:PakhomovaAY/cs-lab02.git (fetch)
origin git@uit.mpei.ru:PakhomovaAY/cs-lab02.git (push)
Ïåðåêëþ÷åíèå íà ìàøèíó Áîáà.
* Ïîëó÷åíèå ïðîåêòà ñ ñåðâåðà
31. Êëîíèðîâàíèå ïðîåêòà:
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/bob
$ git clone git@uit.mpei.ru:PakhomovaAY/cs-lab02.git project
Cloning into 'project'...
Enter passphrase for key '/c/Users/user/.ssh/id_ed25519':
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.
32. Ïåðåêëþ÷åíèå íà êàòàëîã project.
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/bob
$ cd project
33. Íàñòðîéêà õðàíèëèùà Áîáà.
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/bob/project (main)
$ git config user.name 'Bob (PakhomovaAY)'
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/bob/project (main)
$ git config user.email 'PakhomovaAY@mpei.ru'
* Ñîâìåñòíàÿ ðàáîòà íàä ïðîåêòîì áåç êîíôëèêòîâ ïðàâîê
34. Ñ ìàøèíû Áîáà äîáàâëÿþòñÿ èçìåíåíèÿ â êîäå è äåëàåòñÿ êîììèò:
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/bob/project (main)
$ git commit -a -m "code: äîáàâëåí âûâîä ïðîèçâåäåíèÿ"
[main 1319811] code: äîáàâëåí âûâîä ïðîèçâåäåíèÿ
1 file changed, 2 insertions(+), 1 deletion(-)
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/bob/project (main)
$ git show HEAD
commit 1319811cf80c18e5481649e8fd90dfeb93b96174 (HEAD -> main)
Author: Bob (PakhomovaAY) <PakhomovaAY@mpei.ru>
Date: Sun Mar 30 16:14:28 2025 +0300
code: äîáàâëåí âûâîä ïðîèçâåäåíèÿ
diff --git a/main.cpp b/main.cpp
index 9bade74..15a93c2 100644
--- a/main.cpp
+++ b/main.cpp
@@ -8,7 +8,8 @@ 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;
}
35. Îòïðàâêà êîììèòà Áîáà íà ñåðâåð.
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/bob/project (main)
$ git push
Enter passphrase for key '/c/Users/user/.ssh/id_ed25519':
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 uit.mpei.ru:PakhomovaAY/cs-lab02.git
3ed003b..1319811 main -> main
Ïåðåêëþ÷åíèå íà ìàøèíó Àëèñû.
36. Çàãðóçêà èçìåíåíèé, ñäåëàííûõ Áîáîì:
user@WIN-PNK03JICHSD 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), 398 bytes | 8.00 KiB/s, done.
From uit.mpei.ru:PakhomovaAY/cs-lab02
3ed003b..1319811 main -> origin/main
37. Ïîñìîòðåëà èñòîðèþ âåòîê:
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (main)
$ git log --oneline --decorate --all --graph
* 1319811 (origin/main, origin/HEAD) code: äîáàâëåí âûâîä ïðîèçâåäåíèÿ
* 3ed003b (HEAD -> main) git: äîáàâëåíî èãíîðèðîâàíèå ôàéëîâ
* 1881621 code: äîáàâëåí âûâîä ðàçíîñòè äâóõ ÷èñåë
* 727239e code: äîáàâëåí âûâîä ñóììû äâóõ ÷èñåë
* 9edb922 code; äîáàâëåí ââîä äâóõ ÷èñåë
* 97097c1 build: äîáàâëåí ôàéë ïðîåêòà
* 6799c67 code: çàãîòîâêà ïðîãðàììû
Âåòêà main îòñòàåò íà îäèí êîììèò îò âåòêè origin/main.
38. Ïðîäâèíóëà âåòêó main ê ñêà÷àííîé âåðñèè:
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (main)
$ git pull --ff-only
Updating 3ed003b..1319811
Fast-forward
main.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
39. Ñ ìàøèíû Àëèñû äîáàâëÿåòñÿ âûâîä äåëåíèÿ â êîäå è äåëàåòñÿ êîììèò:
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (main)
$ git commit -a -m "code: äîáàâëåí âûâîä äåëåíèÿ"
[main 02de2ce] code: äîáàâëåí âûâîä äåëåíèÿ
1 file changed, 2 insertions(+), 1 deletion(-)
40. Êîììèò Àëèñû îòïðàâëÿåòñÿ íà ñåðâåð:
user@WIN-PNK03JICHSD 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), 430 bytes | 430.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 uit.mpei.ru:PakhomovaAY/cs-lab02.git
1319811..02de2ce main -> main
Ïåðåêëþ÷åíèå íà ìàøèíó Áîáà.
41. Çàãðóçêà èçìåíåíèé íà ìàøèíå Áîáà.
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/bob/project (main)
$ git fetch
Enter passphrase for key '/c/Users/user/.ssh/id_ed25519':
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), 410 bytes | 21.00 KiB/s, done.
From uit.mpei.ru:PakhomovaAY/cs-lab02
1319811..02de2ce main -> origin/main
42. Ïðîäâèæåíèå âåòêè âïåðåä.
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/bob/project (main)
$ git pull --ff-only
Enter passphrase for key '/c/Users/user/.ssh/id_ed25519':
Updating 1319811..02de2ce
Fast-forward
main.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
* Ðàçðåøåíèå êîíôëèêòîâ ïðàâîê ïðè ñîâìåñòíîé ðàáîòå
Íà ìàøèíå Àëèñû:
43. Â êîä äîáàâëÿåòñÿ âûâîä ìàêñèìóìà è îòïðàâëÿåòñÿ íà ñåðâåð.
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (main)
$ git commit -a -m "code: äîáàâëåí âûâîä ìàêñèìóìà"
[main 0e95fa5] code: äîáàâëåí âûâîä ìàêñèìóìà
1 file changed, 2 insertions(+), 1 deletion(-)
user@WIN-PNK03JICHSD 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), 422 bytes | 422.00 KiB/s, done.
Total 3 (delta 1), reused 0 (delta 0), pack-reused 0 (from 0)
Íà ìàøèíå Áîáà:
44.  êîä äîáàâëÿåòñÿ âûâîä ìèíèìóìà è ïðîèñõîäèò ïîïûòêà îòïðàâèòü êîììèò íà ñåðâåð. Íî âûõîäèò îøèáêà, ò.ê. Áîá ïûòàåòñÿ çàãðóçèòü âåðñèþ, îñíîâàííóþ íà áîëåå ñòàðîì êîììèòå, ÷åì ñàìûé íîâûé êîììèò â ðåïîçèòàðèè
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/bob/project (main)
$ git commit -a -m "code: äîáàâëåí âûâîä ìèíèìóìà"
[main b816e19] code: äîáàâëåí âûâîä ìèíèìóìà
1 file changed, 2 insertions(+), 1 deletion(-)
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/bob/project (main)
$ git push
Enter passphrase for key '/c/Users/user/.ssh/id_ed25519':
To uit.mpei.ru:PakhomovaAY/cs-lab02.git
! [rejected] main -> main (fetch first)
error: failed to push some refs to 'uit.mpei.ru:PakhomovaAY/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
[detached HEAD 23313f9] code: äîáàâëåí âûâîä ìèíèìóìà
1 file changed, 2 insertions(+), 2 deletions(-)
Successfully rebased and updated refs/heads/main.
45. Çàãðóçêà âåðñèè ñ ñåðâåðà
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/bob/project (main)
$ git fetch
Enter passphrase for key '/c/Users/user/.ssh/id_ed25519':
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), 410 bytes | 21.00 KiB/s, done.
From uit.mpei.ru:PakhomovaAY/cs-lab02
1319811..02de2ce main -> origin/main
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/bob/project (main)
$ git log --oneline --decorate --all --graph
* 23313f9 (HEAD -> main) code: äîáàâëåí âûâîä ìèíèìóìà
|* 0e95fa5 (origin/main, origin/HEAD) code: äîáàâëåí âûâîä ìàêñèìóìà
| /
* 02de2ce code: äîáàâëåí âûâîä äåëåíèÿ
* 1319811 code: äîáàâëåí âûâîä ïðîèçâåäåíèÿ
* 3ed003b git: äîáàâëåíî èãíîðèðîâàíèå ôàéëîâ
* 1881621 code: äîáàâëåí âûâîä ðàçíîñòè äâóõ ÷èñåë
* 727239e code: äîáàâëåí âûâîä ñóììû äâóõ ÷èñåë
* 9edb922 code; äîáàâëåí ââîä äâóõ ÷èñåë
* 97097c1 build: äîáàâëåí ôàéë ïðîåêòà
* 6799c67 code: çàãîòîâêà ïðîãðàììû
46. Îáúåäèíèì êîììèòû Áîáà è Àëèñû, ïîìåñòèâ êîììèò Áîáà âûøå ñ ïîìîùüþ êîììàíäû git rebase.
$ git rebase origin/main
Auto-merging project/project.cpp
CONFLICT (content): Merge conflict in project/project.cpp
error: could not apply 23313f9... 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".
Could not apply 23313f9... code: äîáàâëåíèå âûâîäà ìèíèìóìà
Êîìàíäà çàâåðøàåòñÿ îøèáêîé. Ïðîèçâîäíûé ôàéë îò ôàéëà Àëèñû è Áîáà çàïèñûâàåòñÿ â ðàáî÷óþ êîïèþ ñ ïîìå÷åííûìè ìåòêàìè êîíôëèêòà. Óáèðàåì ìåòêè êîíôëèêòà, è äîðàáàòûâàåì êîä.
47. Çàòåì çàãðóæàåì èçìåíåíèÿ â èíäåêñ è ïðîäîëæàåì îïåðàöèþ git rebase –continue.
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/bob/project (main)
(main|REBASE 1/1)
$ git add -u
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/bob/project (main)
$ git status
interactive rebase in progress; onto 0e95fa5
Last command done (1 command done):
pick 23313f9 code: äîáàâëåí âûâîä ìèíèìóìà
No commands remaining.
You are currently rebasing branch 'main' on '0e95fa5'.
(all conflicts fixed: run "git rebase --continue")
Changes to be committed:
(use "git restore --staged <file>..." to unstage)
modified: main.cpp
$ git rebase --continue
[detached HEAD 23313f9] code: äîáàâëåí âûâîä ìèíèìóìà
1 file changed, 4 insertions(+)
Successfully rebased and updated refs/heads/main.
48. Èñòîðèÿ õðàíèëèùà:
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/bob/project (main)
$ git log --oneline --decorate --all --graph
* 23313f9 (HEAD -> main) code: äîáàâëåí âûâîä ìèíèìóìà
* 0e95fa5 (origin/main, origin/HEAD) code: äîáàâëåí âûâîä ìàêñèìóìà
* 02de2ce code: äîáàâëåí âûâîä äåëåíèÿ
* 1319811 code: äîáàâëåí âûâîä ïðîèçâåäåíèÿ
* 3ed003b git: äîáàâëåíî èãíîðèðîâàíèå ôàéëîâ
* 1881621 code: äîáàâëåí âûâîä ðàçíîñòè äâóõ ÷èñåë
* 727239e code: äîáàâëåí âûâîä ñóììû äâóõ ÷èñåë
* 9edb922 code; äîáàâëåí ââîä äâóõ ÷èñåë
* 97097c1 build: äîáàâëåí ôàéë ïðîåêòà
* 6799c67 code: çàãîòîâêà ïðîãðàììû
49. Îòïðàâèëà èçìåíåíèÿ íà ñåðâåð.
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/bob/project (main)
$ git push
Enter passphrase for key '/c/Users/user/.ssh/id_ed25519':
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), 443 bytes | 443.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 uit.mpei.ru:PakhomovaAY/cs-lab02.git
0e95fa5..23313f9 main -> main
* Èñïîëüçîâàíèå âåòîê
Ïîêà Áîá ñèíõðîíèçèðîâàë èçìåíåíèÿ, Àëèñà ðåøèëà èçìåíèòü òèï ÷èñåë ñ öåëûõ íà äåéñòâèòåëüíûå.
50. Ñîçäàëà âåòêó double è ïåðåøëà íà íå¸.
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (main)
$ git branch double
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (main)
$ git checkout double
Switched to branch 'double'
51. Çàêîììèòèëà èçìåíåíèÿ.
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (main)
$ git add -u
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (main)
$ git commit -m “code: òèï äàííûõ èçìåíåí íà double”
[double 4ad6484] code: òèï äàííûõ èçìåíåí íà double
1 file changed, 1 insertion(+), 1 deletion(-)
52. Ïåðåêëþ÷èëàñü íà âåòêó main.
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (main)
$ git checkout main
Switched to branch 'main'
Your branch is up to date with 'origin/main'.
53. Ñèíõðîíèçàöèÿ âåòêè main «íà ìàøèíå Àëèñû» ñ ñåðâåðîì. 
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (main)
$ git fetch
Enter passphrase for key '/c/Users/user/.ssh/id_ed25519':
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), 410 bytes | 21.00 KiB/s, done.
From uit.mpei.ru:PakhomovaAY/cs-lab02
1319811..02de2ce main -> origin/main
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (main)
$ git pull --ff-only
Enter passphrase for key '/c/Users/user/.ssh/id_ed25519':
Updating 1319811..02de2ce
Fast-forward
main.cpp | 4 ++++
1 file changed, 4 insertions(+)
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (main)
$ git log --oneline --decorate --all --graph
* 4ad6484 (double) code: òèï äàííûõ èçìåíåí íà double
| * 23313f9 (origin/main, origin/HEAD) code: äîáàâëåí âûâîä ìèíèìóìà
|/
* 0e95fa5 code: äîáàâëåí âûâîä ìàêñèìóìà
* 02de2ce code: äîáàâëåí âûâîä äåëåíèÿ
* 1319811 code: äîáàâëåí âûâîä ïðîèçâåäåíèÿ
* 3ed003b git: äîáàâëåíî èãíîðèðîâàíèå ôàéëîâ
* 1881621 code: äîáàâëåí âûâîä ðàçíîñòè äâóõ ÷èñåë
* 727239e code: äîáàâëåí âûâîä ñóììû äâóõ ÷èñåë
* 9edb922 code; äîáàâëåí ââîä äâóõ ÷èñåë
* 97097c1 build: äîáàâëåí ôàéë ïðîåêòà
* 6799c67 code: çàãîòîâêà ïðîãðàììû
54. Îáúåäèíÿåì âåòêè ñ ïîìîùüþ git merge.
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (main)
$ git merge double
Auto-merging main.cpp
Merge made by the 'ort' strategy.
main.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
55. Îòïðàâëÿåì íà ñåðâåð.
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (main)
$ git push
Enumerating objects: 10, done.
Counting objects: 100% (10/10), done.
Delta compression using up to 16 threads
Compressing objects: 100% (6/6), done.
Writing objects: 100% (6/6), 752 bytes | 752.00 KiB/s, done.
Total 6 (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:PakhomovaAY/cs-lab02.git
23313f9..9bf29d7 main -> main
56. Èñòîðèÿ âñåõ âåòîê
user@WIN-PNK03JICHSD MINGW64 ~/Desktop/lab02/alice/project (main)
$ git log --oneline --decorate --all --graph
* 9bf29d7 (HEAD -> main, origin/main, origin/HEAD) Merge branch 'double'
|\
| * 4ad6484 (double) code: òèï äàííûõ èçìåíåí íà double
* | 23313f9 code: äîáàâëåí âûâîä ìèíèìóìà
|/
* 0e95fa5 code: äîáàâëåí âûâîä ìàêñèìóìà
* 02de2ce code: äîáàâëåí âûâîä äåëåíèÿ
* 1319811 code: äîáàâëåí âûâîä ïðîèçâåäåíèÿ
* 3ed003b git: äîáàâëåíî èãíîðèðîâàíèå ôàéëîâ
* 1881621 code: äîáàâëåí âûâîä ðàçíîñòè äâóõ ÷èñåë
* 727239e code: äîáàâëåí âûâîä ñóììû äâóõ ÷èñåë
* 9edb922 code; äîáàâëåí ââîä äâóõ ÷èñåë
* 97097c1 build: äîáàâëåí ôàéë ïðîåêòà
* 6799c67 code: çàãîòîâêà ïðîãðàììû
Редактирование Предпросмотр
Загрузка…
Отмена
Сохранить