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

build: добавлен отчет

Просмотр исходного кода
main
Alice (AkinshinaDA) 2 месяцев назад
Родитель 1931308468
Сommit 3d0fb8ee61
1 изменённых файлов: 815 добавлений и 0 удалений
Показать статистику Скачать Patch файл Скачать Diff файл

815
README.txt
Unescape Просмотреть файл

@ -0,0 +1,815 @@
Îò÷åò ïî ëàáîðàòîðíîé ðàáîòå ¹ 2 "Ñèñòåìà êîíòðîëÿ âåðñèé Git"
Âûïîëíèëà: Àêèíüøèíà Ä. À.
Ãðóïïà: À-02-24
Ïðîâåðèë: Ôèëàòîâ Ñ. À.
Ïðèìå÷àíèå: ðàáîòà âûïîëíÿëàñü íà Windows.
1 Íà ðàáî÷åì ñòîëå ñîçäàí êàòàëîã lab02, â íåì çàïóùåí Git Bash. Ïðèãëàøåíèå:
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02
$
2 Ïðîñìîòðåíû ôàéëû â ðàáî÷åì êàòàëîãå lab02. Ðåçóëüòàò – ïóñòî.
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02
$ ls
3 Ñîçäàíû êàòàëîãè äëÿ Àëèñû è Áîáà, à òàêæå êàòàëîãè project âíóòðè êàæäîãî.
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02
$ mkdir alice
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02
$ mkdir bob
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02
$ cd alice
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/alice
$ mkdir project
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/alice
$ cd project
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/alice/project
$ cd ..
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/alice
$ cd ..
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02
$ cd bob
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/bob
$ mkdir project
4 Èíèöèàëèçèðîâàí ðåïîçèòàðèé.
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/alice/project
$ git init
Initialized empty Git repository in C:/Users/admin/Desktop/lab02/alice/project/.git/
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/alice/project (master)
$
Ïîäñêàçêà íå ïîÿâèëàñü.
5 Íàñòðîåí ðåïîçèòàðèé Àëèñû
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/alice/project (master)
$ git config user.name "Alice (AkinshinaDA)"
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/alice/project (master)
$ git config user.email akinshinada@mpei.ru
6 Ñîçäàí è ñîáðàí ïðîåêò â ðåïîçèòàðèè Àëèñû.
7 Âûïîëíåíà ïðîâåðêà ñîñòîÿíèÿ ðàáî÷åé êîïèè:
admin@DESKTOP-EMRG1JC 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/ //àâòîìàòè÷åñêè ñîçäàí codeblocks ïðè ñáîðêå
main.cpp //êîä ïðîãðàììû
obj/ //àâòîìàòè÷åñêè ñîçäàí codeblocks ïðè ñáîðêå
project.cbp //ôàéë ïðîåêòà
nothing added to commit but untracked files present (use "git add" to track)
8 Íà÷àòî îòñëåæèâàíèå ôàéëà main.cpp:
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/alice/project (master)
$ git add main.cpp
Åùå ðàç âûïîëíåíà ïðîâåðêà ñîñòîÿíèÿ ðàáî÷åé êîïèè:
admin@DESKTOP-EMRG1JC 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 Âûïîëíåí êîììèò ñ ôàéëîì main.cpp
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/alice/project (master)
$ git commit -m "code: çàãîòîâêà ïðîãðàììû"
[master (root-commit) 888f6be] code: çàãîòîâêà ïðîãðàììû
1 file changed, 9 insertions(+)
create mode 100644 main.cpp
10 Ïðîèçâåäåíà ñìåíà èìåíè âåòêè íà main
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/alice/project (master)
$ git branch -m main
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/alice/project (main)
$
11 Ôàéë project.cbp äîáàâëåí â èíäåêñ
admin@DESKTOP-EMRG1JC 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
12 Âûïîëíåí êîììèò ñ ôàéëîì project.cbp
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/alice/project (main)
$ git commit -m "build: äîáàâëåí ôàéë ïðîåêòà"
[main fa52ffc] build: äîáàâëåí ôàéë ïðîåêòà
1 file changed, 40 insertions(+)
create mode 100644 project.cbp
13 Â ïðîãðàììó âíåñåí ââîä ïåðåìåííûõ
cout << "Enter A and B: ";
int a, b;
cin >> a >> b;
Ïðîãðàììà ñîáðàíà.
14 Âûïîëíåíà ïðîâåðêà ñîñòîÿíèÿ ðàáî÷åé êîïèè:
admin@DESKTOP-EMRG1JC 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 // ôàéë 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")
15 Âûáðàí è çàêîììè÷åí ôàéë main.cpp
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/alice/project (main)
$ git add main.cpp
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/alice/project (main)
$ git commit -m "code: ââîä ïåðåìåííûõ"
[main a781f54] code: ââîä ïåðåìåííûõ
1 file changed, 4 insertions(+), 2 deletions(-)
16 Â ïðîãðàììó âíåñåí âûâîä ñóììû
cout << "A + B = " << a+b << '\n';
Ïðîãðàììà ñîáðàíà
17 Âûáðàí è çàêîììè÷åí ôàéë main.cpp
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/alice/project (main)
$ git add main.cpp
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/alice/project (main)
$ git commit -m "code: âûâîä ñóììû"
[main 4a049e0] code: âûâîä ñóììû
1 file changed, 1 insertion(+)
18 Â ïðîãðàììó âíåñåí âûâîä ðàçíîñòè
<< "A - B = " << a - b << '\n';
Ïðîãðàììà ñîáðàíà
19 Âûïîëíåí êîììèò
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/alice/project (main)
$ git add -u
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/alice/project (main)
$ git commit -m "code: âûâîä ðàçíîñòè"
[main 89b1ffc] code: âûâîä ðàçíîñòè
1 file changed, 2 insertions(+), 1 deletion(-)
20 Ñîçäàí ôàéë .gitignore, â íåãî âíåñåí êàòàëîã /bin
21 Âûïîëíåíà ïðîâåðêà ñîñòîÿíèÿ ðàáî÷åé êîïèè:
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/alice/project (main)
$ git status
On branch main
Untracked files: //êàòàëîã /bin ïðîèãíîðèðîâàí
(use "git add <file>..." to include in what will be committed)
.gitignore
obj/
nothing added to commit but untracked files present (use "git add" to track)
22 Äîáàâëåíû ïðàâèëà èãíîðèðîâàíèÿ äëÿ /obj è *.layout
23 Âûïîëíåíà ïðîâåðêà ñîñòîÿíèÿ ðàáî÷åé êîïèè:
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/alice/project (main)
$ git status
On branch main
Untracked files:
(use "git add <file>..." to include in what will be committed)
.gitignore //ïðîèãíîðèðîâàíî âñå
nothing added to commit but untracked files present (use "git add" to track)
24 Âûïîëíåí êîììèò
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/alice/project (main)
$ git add .gitignore
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/alice/project (main)
$ git commit -m "git: ñîçäàíû ïðàâèëà èãíîðèðîâàíèÿ"
[main a8b5501] git: ñîçäàíû ïðàâèëà èãíîðèðîâàíèÿ
1 file changed, 3 insertions(+)
create mode 100644 .gitignore
25 Âûçâàí æóðíàë ðåïîçèòàðèÿ
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/alice/project (main)
$ git log --stat
commit a8b5501ea869a36eb92499dc4561ae62d8ad6f7c (HEAD -> main) //õýø êîììèòà
Author: Alice (AkinshinaDA) akinshinada@mpei.ru //ïîëüçîâàòåëü, êîò. âíåñ êîììèò
Date: Fri Feb 21 18:20:18 2025 +0300 //òî÷íîå âðåìÿ âûïîëíåíèÿ êîììèòà
git: ñîçäàíû ïðàâèëà èãíîðèðîâàíèÿ //ñîîáùåíèå ïðè êîììèòå
.gitignore | 3 +++ //ôàéë, â êîò. âíåñåíû èçìåíåíèÿ, èõ êîëè÷åñòâî è õàðàêòåð
1 file changed, 3 insertions(+)
commit 89b1ffc9319191da907247337fb5c592a9846f12
Author: Alice (AkinshinaDA) <akinshinada@mpei.ru>
Date: Fri Feb 21 18:05:26 2025 +0300
code: âûâîä ðàçíîñòè
main.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
commit 4a049e001fc09d0612888736f9117879f2c4a751
Author: Alice (AkinshinaDA) <akinshinada@mpei.ru>
Date: Fri Feb 21 18:01:46 2025 +0300
code: âûâîä ñóììû
26 Íàéäåíû êîììèòû ïî òåìå build
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/alice/project (main)
$ git log --grep "build:"
commit fa52ffcba90c0f7f31f9b991e2a18d41c44cd0c4
Author: Alice (AkinshinaDA) <akinshinada@mpei.ru>
Date: Fri Feb 21 17:32:57 2025 +0300
build: äîáàâëåí ôàéë ïðîåêòà
27 Íàéäåíû êîììèòû, çàòðàãèâàþùèå project.cbp
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/alice/project (main)
$ git log -- project.cbp
commit fa52ffcba90c0f7f31f9b991e2a18d41c44cd0c4
Author: Alice (AkinshinaDA) <akinshinada@mpei.ru>
Date: Fri Feb 21 17:32:57 2025 +0300
build: äîáàâëåí ôàéë ïðîåêòà
28 Âûïîëíåí ïðîñìîòð ïðåäïîñëåäíåãî êîììèòà
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/alice/project (main)
$ git show HEAD~1
commit 89b1ffc9319191da907247337fb5c592a9846f12
Author: Alice (AkinshinaDA) <akinshinada@mpei.ru>
Date: Fri Feb 21 18:05:26 2025 +0300
code: âûâîä ðàçíîñòè
diff --git a/main.cpp b/main.cpp
index 1e9a4c0..52941f6 100644
--- a/main.cpp
+++ b/main.cpp
@@ -7,6 +7,7 @@ int main()
cout << "Enter A and B: ";
int a, b;
cin >> a >> b;
- cout << "A + B = " << a+b << '\n';
+ cout << "A + B = " << a+b << '\n'
+ << "A - B = " << a-b << '\n';
return 0;
}
29 Â ïðîãðàììó âíåñåí âûâîä ïðîèçâåäåíèÿ
<< "A * B = " << a*b << '\n';
Ïðîãðàììà ñîáðàíà.
30 Ïðîñìîòðåíû èçìåíåíèÿ â ðàáî÷åé êîïèè
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/alice/project (main)
$ git diff
diff --git a/main.cpp b/main.cpp // óêàçàíèå â êàêîì ôàéëå ïðîèçîøëè èçìåíåíèÿ
index 52941f6..bbb405d 100644
--- a/main.cpp
+++ b/main.cpp
@@ -8,6 +8,7 @@ int main() //èçìåíåííàÿ ôóíêöèÿ ïðîãðàììû
int a, b; //êîíòåêñò
cin >> a >> b;
cout << "A + B = " << a+b << '\n'
- << "A - B = " << a-b << '\n'; //óêàçàíèå êàêèå ñòðîêè áûëè óäàëåíû, à êàêèå - äîáàâëåíû
+ << "A - B = " << a-b << '\n'
+ << "A * B = " << a*b << '\n';
return 0;
}
31 Ïðîñìîòðåíà ðàçíèöà ìåæäó ñàìûì ïåðâûì êîììèòîì è êîììèòîì, äîáàâëÿþùèì âûâîä ðàçíîñòè
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/alice/project (main)
$ git diff HEAD~5 HEAD~1
diff --git a/main.cpp b/main.cpp
index b4392ec..52941f6 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,9 +1,13 @@
#include <iostream>
-
+#include <math.h>
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>
32 Âûïîëíåí êîììèò
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/alice/project (main)
$ git commit -m "code: âûâîä ïðîèçâåäåíèÿ"
[main 9ec1203] code: âûâîä ïðîèçâåäåíèÿ
1 file changed, 2 insertions(+), 1 deletion(-)
33 Ïðåäûäóùèé êîììèò îòìåíåí
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/alice/project (main)
$ git reset --hard HEAD~1
HEAD is now at a8b5501 git: ñîçäàíû ïðàâèëà èãíîðèðîâàíèÿ
34 Äîáàâëåíî è óäàëåíî èçìåíåíèå â main.cpp
35 Ñîçäàíà ïàðà êëþ÷åé
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/alice/project (main)
$ ssh-keygen
Generating public/private ed25519 key pair.
Enter file in which to save the key (/c/Users/admin/.ssh/id_ed25519):
Created directory '/c/Users/admin/.ssh'.
Enter passphrase for "/c/Users/admin/.ssh/id_ed25519" (empty for no passphrase):
Enter same passphrase again:
Your identification has been saved in /c/Users/admin/.ssh/id_ed25519
Your public key has been saved in /c/Users/admin/.ssh/id_ed25519.pub
The key fingerprint is:
SHA256:1TstXg+59sHAAOUNcLYCJYXFPU0Il9qSDL73h6/to5Q admin@DESKTOP-EMRG1JC
The key's randomart image is:
+--[ED25519 256]--+
| o*B=*=. |
| oo.**+. |
| . o.=+o. |
| . *..oo . |
| S . +o= |
| . . ..+o+ |
| . .Eo oo.|
| .o.+ ..|
| o*+. .|
+----[SHA256]-----+
36 Çàïóùåí àãåíò è çàãðóæåí êëþ÷
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/alice/project (main)
$ eval $(ssh-agent -s)
Agent pid 571
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/alice/project (main)
$ ssh-add
Enter passphrase for /c/Users/admin/.ssh/id_ed25519:
Identity added: /c/Users/admin/.ssh/id_ed25519 (admin@DESKTOP-EMRG1JC)
37 Ïîëó÷åí îòêðûòûé êëþ÷
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/alice/project (main)
$ cat ~/.ssh/id_ed25519.pub
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDtf5aAZEu+mt6YX2iWx8+S1UDqCIxuk0bjvq6YtoJ34 admin@DESKTOP-EMRG1JC
38 Ïðîåêò îòïðàâëåí íà ñåðâåð
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/alice/project (main)
$ git remote add origin git@uit.mpei.ru:AkinshinaDA/cs-lab02.git
admin@DESKTOP-EMRG1JC 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: 21, done.
Counting objects: 100% (21/21), done.
Delta compression using up to 20 threads
Compressing objects: 100% (19/19), done.
Writing objects: 100% (21/21), 2.67 KiB | 2.67 MiB/s, done.
Total 21 (delta 3), reused 0 (delta 0), pack-reused 0 (from 0)
remote: . Processing 1 references
remote: Processed 1 references in total
To uit.mpei.ru:AkinshinaDA/cs-lab02.git
* [new branch] main -> main
branch 'main' set up to track 'origin/main'.
39 Ïîëó÷åí ïðîåêò ñ ñåðâåðà
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/bob
$ git clone git@uit.mpei.ru:AkinshinaDA/cs-lab02.git project
Cloning into 'project'...
Enter passphrase for key '/c/Users/admin/.ssh/id_ed25519':
remote: Enumerating objects: 21, done.
remote: Counting objects: 100% (21/21), done.
remote: Compressing objects: 100% (19/19), done.
remote: Total 21 (delta 3), reused 0 (delta 0), pack-reused 0
Receiving objects: 100% (21/21), 2.67 KiB | 2.67 MiB/s, done.
Resolving deltas: 100% (3/3), done.
40 Íàñòðîåí git äëÿ Áîáà
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/bob/project (main)
$ git config user.name "Bob (AkinshinaDA)"
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/bob/project (main)
$ git config user.email akinshinada@mpei.ru
41 Â ïðîãðàììó âíåñåí âûâîä ïðîèçâåäåíèÿ
<< "A * B = " << a*b << '\n';
Ïðîãðàììà ñîáðàíà
42 Âûïîëíåí êîììèò
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/bob/project (main)
$ git commit -m "code: âûâîä ïðîèçâåäåíèÿ"
[main bc7b613] code: âûâîä ïðîèçâåäåíèÿ
1 file changed, 2 insertions(+), 1 deletion(-)
43 Ïðåäûäóùèé êîììèò îòïðàâëåí íà ñåðâåð
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/bob/project (main)
$ git push
Enter passphrase for key '/c/Users/admin/.ssh/id_ed25519':
Enumerating objects: 5, done.
Counting objects: 100% (5/5), done.
Delta compression using up to 20 threads
Compressing objects: 100% (3/3), done.
Writing objects: 100% (3/3), 407 bytes | 407.00 KiB/s, done.
Total 3 (delta 1), reused 1 (delta 0), pack-reused 0 (from 0)
remote: . Processing 1 references
remote: Processed 1 references in total
To uit.mpei.ru:AkinshinaDA/cs-lab02.git
74cf8ed..bc7b613 main -> main
44 Âûïîëíåíà çàãðóçêà èçìåíåíèé íà ìàøèíó Àëèñû
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/alice/project (main)
$ git fetch
remote: Enumerating objects: 6, done.
remote: Counting objects: 100% (6/6), done.
remote: Compressing objects: 100% (4/4), done.
remote: Total 4 (delta 1), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (4/4), 564 bytes | 188.00 KiB/s, done.
From uit.mpei.ru:AkinshinaDA/cs-lab02
9ec1203..bc7b613 main -> origin/main
45 Âåòêà Àëèñû ïðîäâèíóòà ê ñêà÷àííîé âåðñèè
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/alice/project (main)
$ git pull --ff-only
Updating a8b5501..bc7b613
Fast-forward
main.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
46 Â ïðîãðàììó âíåñåí âûâîä äåëåíèÿ
<< "A / B = " << a/b << '\n';
Ïðîãðàììà ñîáðàíà.
47 Âûïîëíåí êîììèò
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/alice/project (main)
$ git commit -m "code: âûâîä äåëåíèÿ"
[main ac58fec] code: âûâîä äåëåíèÿ
1 file changed, 2 insertions(+), 1 deletion(-)
48 Èçìåíåíèÿ îòïðàâëåíû íà ñåðâåð
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/alice/project (main)
$ git push
Enumerating objects: 5, done.
Counting objects: 100% (5/5), done.
Delta compression using up to 20 threads
Compressing objects: 100% (3/3), done.
Writing objects: 100% (3/3), 395 bytes | 395.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:AkinshinaDA/cs-lab02.git
bc7b613..ac58fec main -> main
49 Âûïîëíåíà çàãðóçêà èçìåíåíèé íà ìàøèíó Áîáà
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/bob/project (main)
$ git pull
Enter passphrase for key '/c/Users/admin/.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), 375 bytes | 93.00 KiB/s, done.
From uit.mpei.ru:AkinshinaDA/cs-lab02
bc7b613..ac58fec main -> origin/main
Updating bc7b613..ac58fec
Fast-forward
main.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
50 Â ïðîãðàììó âíåñåí âûâîä ìàêñèìóìà ó Àëèñû
int max;
if (a>b){
max = a;
}
else max = b;
cout << "A + B = " << a+b << '\n'
<< "A - B = " << a-b << '\n'
<< "A * B = " << a*b << '\n'
<< "A / B = " << a/b << '\n'
<< "Max = " << max << '\n';
Ïðîãðàììà ñîáðàíà.
51 Âûïîëíåí êîììèò ó Àëèñû
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/alice/project (main)
$ git commit -m "code: âûâîä ìàêñèìóìà"
[main f7ce1be] code: âûâîä ìàêñèìóìà
1 file changed, 7 insertions(+), 1 deletion(-)
52 Èçìåíåíèÿ îòïðàâëåíû íà ñåðâåð
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/alice/project (main)
$ git push
Enumerating objects: 5, done.
Counting objects: 100% (5/5), done.
Delta compression using up to 20 threads
Compressing objects: 100% (3/3), done.
Writing objects: 100% (3/3), 457 bytes | 457.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:AkinshinaDA/cs-lab02.git
ac58fec..f7ce1be main -> main
53 Â ïðîãðàììó âíåñåí âûâîä ìèíèìóìà ó Áîáà
int min;
if (a<b){
min = a;
}
else min = b;
cout << "A + B = " << a+b << '\n'
<< "A - B = " << a-b << '\n'
<< "A * B = " << a*b << '\n'
<< "A / B = " << a/b << '\n'
<< "Min = " << min << '\n';
Ïðîãðàììà ñîáðàíà.
54 Âûïîëíåí êîììèò
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/bob/project (main)
$ git commit -m "code: âûâîä ìèíèìóìà"
[main eb5662a] code: âûâîä ìèíèìóìà
1 file changed, 7 insertions(+), 1 deletion(-)
55 Ïîïûòêà îòïðàâêè íà ñåðâåð
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/bob/project (main)
$ git push
Enter passphrase for key '/c/Users/admin/.ssh/id_ed25519':
To uit.mpei.ru:AkinshinaDA/cs-lab02.git
! [rejected] main -> main (fetch first)
error: failed to push some refs to 'uit.mpei.ru:AkinshinaDA/cs-lab02.git'
56 Çàãðóæåíû êîììèòû ñ ñåðâåðà
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/bob/project (main)
$ git fetch
Enter passphrase for key '/c/Users/admin/.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), 437 bytes | 109.00 KiB/s, done.
From uit.mpei.ru:AkinshinaDA/cs-lab02
ac58fec..f7ce1be main -> origin/main
57 Çàãðóæåíà èñòîðèÿ âñåõ âåòîê
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/bob/project (main)
$ git log --oneline --decorate --all --graph
* eb5662a (HEAD -> main) code: âûâîä ìèíèìóìà
| * f7ce1be (origin/main, origin/HEAD) code: âûâîä ìàêñèìóìà
|/
* ac58fec code: âûâîä äåëåíèÿ
* bc7b613 code: âûâîä ïðîèçâåäåíèÿ
* 74cf8ed revert 9ec1203c89e786970f8f53658219bae10842e349
* 9ec1203 code: âûâîä ïðîèçâåäåíèÿ
* a8b5501 git: ñîçäàíû ïðàâèëà èãíîðèðîâàíèÿ
* 89b1ffc code: âûâîä ðàçíîñòè
* 4a049e0 code: âûâîä ñóììû
* a781f54 code: ââîä ïåðåìåííûõ
* fa52ffc build: äîáàâëåí ôàéë ïðîåêòà
* 888f6be code: çàãîòîâêà ïðîãðàììû
58 Êîììèò Áîáà ïåðåìåùåí ïîâåðõ êîììèòà Àëèñû
admin@DESKTOP-EMRG1JC 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 eb5662a... code: âûâîä ìèíèìóìà
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Could not apply eb5662a... code: âûâîä ìèíèìóìà
59 Âûïîëíåíà ïðîâåðêà ñîñòîÿíèÿ ðàáî÷åé êîïèè:
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/bob/project (main|REBASE 1/1)
$ git status
interactive rebase in progress; onto f7ce1be
Last command done (1 command done):
pick eb5662a code: âûâîä ìèíèìóìà
No commands remaining.
You are currently rebasing branch 'main' on 'f7ce1be'.
(fix conflicts and then run "git rebase --continue")
(use "git rebase --skip" to skip this patch)
(use "git rebase --abort" to check out the original branch)
Unmerged paths:
(use "git restore --staged <file>..." to unstage)
(use "git add <file>..." to mark resolution)
both modified: main.cpp
no changes added to commit (use "git add" and/or "git commit -a")
60 Óäàëåí êîíôëèêò â êîäå
int max;
if (a>b){
max = a;
}
else max = b;
int min;
if (a<b){
min = a;
}
else min = b;
cout << "A + B = " << a+b << '\n'
<< "A - B = " << a-b << '\n'
<< "A * B = " << a*b << '\n'
<< "A / B = " << a/b << '\n'
<< "Max = " << max << '\n'
<< "Min = " << min << '\n';
61 Çàâåðøåí ïåðåíîñ êîììèòà Áîáà
[detached HEAD a9a3d8b] "code: èñïðàâëåíèå êîíôëèêòà"
1 file changed, 7 insertions(+), 1 deletion(-)
Successfully rebased and updated refs/heads/main.
62 Âûçâàíà èñòîðèÿ õðàíèëèùà
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/bob/project (main)
$ git log --oneline --decorate --all --graph
* a9a3d8b (HEAD -> main) "code: èñïðàâëåíèå êîíôëèêòà"
* f7ce1be (origin/main, origin/HEAD) code: âûâîä ìàêñèìóìà
* ac58fec code: âûâîä äåëåíèÿ
* bc7b613 code: âûâîä ïðîèçâåäåíèÿ
* 74cf8ed revert 9ec1203c89e786970f8f53658219bae10842e349
* 9ec1203 code: âûâîä ïðîèçâåäåíèÿ
* a8b5501 git: ñîçäàíû ïðàâèëà èãíîðèðîâàíèÿ
* 89b1ffc code: âûâîä ðàçíîñòè
* 4a049e0 code: âûâîä ñóììû
* a781f54 code: ââîä ïåðåìåííûõ
* fa52ffc build: äîáàâëåí ôàéë ïðîåêòà
* 888f6be code: çàãîòîâêà ïðîãðàììû
63 Èçìåíåíèÿ âûãðóæåíû íà ñåðâåð
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/bob/project (main)
$ git push
Enter passphrase for key '/c/Users/admin/.ssh/id_ed25519':
Enumerating objects: 5, done.
Counting objects: 100% (5/5), done.
Delta compression using up to 20 threads
Compressing objects: 100% (3/3), done.
Writing objects: 100% (3/3), 450 bytes | 450.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:AkinshinaDA/cs-lab02.git
f7ce1be..a9a3d8b main -> main
64 Ñîçäàíà âåòêà double
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/alice/project (main)
$ git branch double
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/alice/project (main)
$ git checkout double
Switched to branch 'double'
65 Â ïðîãðàììå èçìåíåí òèï ïåðåìåííûõ
double a, b;
Ïðîãðàììà ñîáðàíà.
66 Âûïîëíåí êîììèò
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/alice/project (double)
$ git add main.cpp
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/alice/project (double)
$ git commit -m "code: çàìåíà òèïà ïåðåìåííûõ"
[double 45b258d] code: çàìåíà òèïà ïåðåìåííûõ
1 file changed, 1 insertion(+), 1 deletion(-)
67 Ïåðåêëþ÷åíèå íà âåòêó main
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/alice/project (double)
$ git checkout main
Switched to branch 'main'
Your branch is up to date with 'origin/main'.
68 Âåòêà main Àëèñû ñèíõðîíèçèðîâàíà ñ ñåðâåðîì
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/alice/project (main)
$ git pull
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), 430 bytes | 86.00 KiB/s, done.
From uit.mpei.ru:AkinshinaDA/cs-lab02
f7ce1be..a9a3d8b main -> origin/main
Updating f7ce1be..a9a3d8b
Fast-forward
main.cpp | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
69 Ïðîñìîòðåíà èñòîðèÿ âñåõ âåòîê
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/alice/project (main)
$ git log --oneline
a9a3d8b (HEAD -> main, origin/main, origin/HEAD) "code: èñïðàâëåíèå êîíôëèêòà"
f7ce1be code: âûâîä ìàêñèìóìà
ac58fec code: âûâîä äåëåíèÿ
bc7b613 code: âûâîä ïðîèçâåäåíèÿ
74cf8ed revert 9ec1203c89e786970f8f53658219bae10842e349
9ec1203 code: âûâîä ïðîèçâåäåíèÿ
a8b5501 git: ñîçäàíû ïðàâèëà èãíîðèðîâàíèÿ
89b1ffc code: âûâîä ðàçíîñòè
4a049e0 code: âûâîä ñóììû
a781f54 code: ââîä ïåðåìåííûõ
fa52ffc build: äîáàâëåí ôàéë ïðîåêòà
888f6be code: çàãîòîâêà ïðîãðàììû
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/alice/project (double)
$ git log --oneline
45b258d (HEAD -> double) code: çàìåíà òèïà ïåðåìåííûõ
f7ce1be code: âûâîä ìàêñèìóìà
ac58fec code: âûâîä äåëåíèÿ
bc7b613 code: âûâîä ïðîèçâåäåíèÿ
74cf8ed revert 9ec1203c89e786970f8f53658219bae10842e349
9ec1203 code: âûâîä ïðîèçâåäåíèÿ
a8b5501 git: ñîçäàíû ïðàâèëà èãíîðèðîâàíèÿ
89b1ffc code: âûâîä ðàçíîñòè
4a049e0 code: âûâîä ñóììû
a781f54 code: ââîä ïåðåìåííûõ
fa52ffc build: äîáàâëåí ôàéë ïðîåêòà
888f6be code: çàãîòîâêà ïðîãðàììû
70 Ïðîèçâåäåíî ñëèÿíèå âåòêè double
Auto-merging main.cpp
Merge made by the 'ort' strategy.
main.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
71 Èçìåíåíèÿ îòïðàâëåíû íà ñåðâåð
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/alice/project (main)
$ git push
Enumerating objects: 10, done.
Counting objects: 100% (10/10), done.
Delta compression using up to 20 threads
Compressing objects: 100% (6/6), done.
Writing objects: 100% (6/6), 761 bytes | 761.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:AkinshinaDA/cs-lab02.git
a9a3d8b..1931308 main -> main
72 Èñòîðèÿ âñåõ âåòîê
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/alice/project (main)
$ git log --oneline
1931308 (HEAD -> main, origin/main, origin/HEAD) git: ñëèÿíèå âåòêè double
45b258d (double) code: çàìåíà òèïà ïåðåìåííûõ
a9a3d8b "code: èñïðàâëåíèå êîíôëèêòà"
f7ce1be code: âûâîä ìàêñèìóìà
ac58fec code: âûâîä äåëåíèÿ
bc7b613 code: âûâîä ïðîèçâåäåíèÿ
74cf8ed revert 9ec1203c89e786970f8f53658219bae10842e349
9ec1203 code: âûâîä ïðîèçâåäåíèÿ
a8b5501 git: ñîçäàíû ïðàâèëà èãíîðèðîâàíèÿ
89b1ffc code: âûâîä ðàçíîñòè
4a049e0 code: âûâîä ñóììû
a781f54 code: ââîä ïåðåìåííûõ
fa52ffc build: äîáàâëåí ôàéë ïðîåêòà
888f6be code: çàãîòîâêà ïðîãðàììû
admin@DESKTOP-EMRG1JC MINGW64 ~/Desktop/lab02/alice/project (double)
$ git log --oneline
45b258d (HEAD -> double) code: çàìåíà òèïà ïåðåìåííûõ
f7ce1be code: âûâîä ìàêñèìóìà
ac58fec code: âûâîä äåëåíèÿ
bc7b613 code: âûâîä ïðîèçâåäåíèÿ
74cf8ed revert 9ec1203c89e786970f8f53658219bae10842e349
9ec1203 code: âûâîä ïðîèçâåäåíèÿ
a8b5501 git: ñîçäàíû ïðàâèëà èãíîðèðîâàíèÿ
89b1ffc code: âûâîä ðàçíîñòè
4a049e0 code: âûâîä ñóììû
a781f54 code: ââîä ïåðåìåííûõ
fa52ffc build: äîáàâëåí ôàéë ïðîåêòà
888f6be code: çàãîòîâêà ïðîãðàììû
Редактирование Предпросмотр
Загрузка…
Отмена
Сохранить