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

Сравнить коммиты

базовая ветка: MachulinaDV:master
Ветки Теги
MachulinaDV:master
MachulinaDV:main
MachulinaDV:double
...
взять из: MachulinaDV:main
Ветки Теги
MachulinaDV:master
MachulinaDV:main
MachulinaDV:double

Ничего общего в коммитах. 'master' и 'main' имеют совершенно разные истории.
master ... main

4 изменённых файлов: 53 добавлений и 689 удалений
Показать статистику

3
.gitignore поставляемый
Unescape Просмотреть файл

@ -0,0 +1,3 @@
/Project.vcxproj
/Project.vcxproj.filters
/Project.vcxproj.user

31
Project.sln
Unescape Просмотреть файл

@ -0,0 +1,31 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.28307.1758
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Project", "Project.vcxproj", "{DEB389E9-FDD2-4194-9708-1DE969B756D9}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{DEB389E9-FDD2-4194-9708-1DE969B756D9}.Debug|x64.ActiveCfg = Debug|x64
{DEB389E9-FDD2-4194-9708-1DE969B756D9}.Debug|x64.Build.0 = Debug|x64
{DEB389E9-FDD2-4194-9708-1DE969B756D9}.Debug|x86.ActiveCfg = Debug|Win32
{DEB389E9-FDD2-4194-9708-1DE969B756D9}.Debug|x86.Build.0 = Debug|Win32
{DEB389E9-FDD2-4194-9708-1DE969B756D9}.Release|x64.ActiveCfg = Release|x64
{DEB389E9-FDD2-4194-9708-1DE969B756D9}.Release|x64.Build.0 = Release|x64
{DEB389E9-FDD2-4194-9708-1DE969B756D9}.Release|x86.ActiveCfg = Release|Win32
{DEB389E9-FDD2-4194-9708-1DE969B756D9}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {FD124965-C430-4504-B52A-63389D0FE854}
EndGlobalSection
EndGlobal

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

@ -1,689 +0,0 @@
Îò÷åò ïî ëàáîðàòîðíîé ðàáîòå ¹ 2 "Ñèñòåìà êîíòðîëÿ âåðñèé Git"
Âûïîëíèë: Ìà÷óëèíà Ä. Â.
Ãðóïïà: À-02-22
Ïðîâåðèë: Êîçëþê Ä. À.
Ïðèìå÷àíèå: ðàáîòà âûïîëíÿëàñü íà Windows.
Õîä ðàáîòû:
1. Ñîçäàíèå íà ðàáî÷åì ñòîëå êàòàëîã lab02 è çàïóñòèë â íåì Git Bash, ïðèãëàøåíèå:
daria@mypc MINGW64 ~/Desktop/lab-02
$
2. Ïðîñìîòð ôàéëîâ â ðàáî÷åì êàòàëîãå êîìàíäîé ls:
daria@mypc MINGW64 ~/Desktop/lab-02
$
Òàê êàê â êàòàëîãå ïóñòî, â êîíñîëè íå îòîáðàæàåòñÿ íèêàêîãî ðåçóëüòàòà.
3. Ñîçäàíèå ïàïîê alice è bob – èìèòàöèÿ êîìïüþòåðîâ äâóõ ïîëüçîâàòåëåé:
daria@mypc MINGW64 ~/Desktop/lab-02
$ mkdir alice
daria@mypc MINGW64 ~/Desktop/lab-02
$ mkdir bob
4. Êîìàíäà cd:
4.1 Ïåðåõîä â ïàïêó Àëèñû:
daria@mypc MINGW64 ~/Desktop/lab-02
$ cd alice
daria@mypc MINGW64 ~/Desktop/lab-02/alice
Âîçâðàùåíèå íà óðîâåíü âûøå ñ ïîìîùüþ êîìàíäû cd ..:
daria@mypc MINGW64 ~/Desktop/lab-02/alice
$ cd ..
daria@mypc MINGW64 ~/Desktop/lab-02
$
Ïåðåõîä â ïàïêó Áîáà:
daria@mypc MINGW64 ~/Desktop/lab-02
$ cd bob
È âîçâðàùåíèå îáðàòíî â ïàïêó Àëèñû:
daria@mypc MINGW64 ~/Desktop/lab-02/bob
$ cd ..
daria@mypc MINGW64 ~/Desktop/lab-02
$ cd alice
daria@mypc MINGW64 ~/Desktop/lab-02/alice
$
4.2 Ñîçäàíèå êàòàëîãà project è ïåðåõîä â íåãî:
daria@mypc MINGW64 ~/Desktop/lab-02/alice
$ mkdir project
daria@mypc MINGW64 ~/Desktop/lab-02/alice
$ cd project
daria@mypc MINGW64 ~/Desktop/lab-02/alice/project
$
4.3 Ïåðåõîä èç ïàïêè project â ïàïêó Àëèñû è îáðàòíî:
daria@mypc MINGW64 ~/Desktop/lab-02/alice/project
$ cd ..
daria @mypc MINGW64 ~/Desktop/lab-02/alice
$ cd project
daria @mypc MINGW64 ~/Desktop/lab-02/alice/project
$
5. Èíèöèàëèçàöèÿ ðåïîçèòîðèÿ:
daria @mypc MINGW64 ~/Desktop/lab-02/alice/project
$ git init
Initialized empty Git repository in C:/Users/user/Desktop/lab-02/alice/project/.git/
daria @mypc MINGW64 ~/Desktop/lab-02/alice/project (master)
$
Òàê êàê èñïîëüçóåòñÿ ñòàðàÿ âåðñèÿ Git, èìÿ áóäåò èçìåíåíî ïîçäíåå.
6. Íàñòðîéêà ðåïîçèòàðèÿ Àëèñû:
daria @mypc MINGW64 ~/Desktop/lab-02/alice/project (master)
$ git config user.name 'Alice (MachulinaDV)'
daria @mypc MINGW64 ~/Desktop/lab-02/alice/project (master)
$ git config user.email 'MachulinaDV@mpei.ru'
7. Ïðîâåðêà ñîñòîÿíèÿ ðàáî÷åé êîïèè:
daria @mypc MINGW64 ~/Desktop/lab-02/alice/project (master)
$ git status
On branch master – ðàñïîëîæåíèå êîïèè (âåòêà)
No commits yet – êîëè÷åñòâî êîììèòîâ.
Untracked files:
(use "git add <file>..." to include in what will be committed)
.vs/
Project.sln
Project.vcxproj
Project.vcxproj.filters
Project.vcxproj.user
Source.cpp
Ôàéëû â ðåïîçèòîðèè. Èõ ñîñòîÿíèÿ (îòñëåæèâàþòñÿ èëè íåò.  äàííîì ñëó÷àå – íåò)
nothing added to commit but untracked files present (use "git add" to track) – ñîîáùåíèå î ïðèñóòñòâèè íåîòñëåæèâàåìûõ ôàéëîâ â âåòêå.
8. Îòñëåæèâàåíèå ôàéëà Source.cpp:
daria@mypc MINGW64 ~/Desktop/lab-02/alice/project (master)
$ git add Source.cpp
8.1 Èçìåíåíèÿ â ðåïîçèòîðèè:
daria @mypc MINGW64 ~/Desktop/lab-02/alice/project (master)
$ git status
On branch master
No commits yet
Changes to be committed:
(use "git rm --cached <file>..." to unstage)
new file: Source.cpp
Untracked files:
(use "git add <file>..." to include in what will be committed)
.vs/
Project.sln
Project.vcxproj
Project.vcxproj.filters
Project.vcxproj.user
9. Ñîçäàíèå êîììèòà:
daria@mypc MINGW64 ~/Desktop/lab-02/alice/project (master)
$ git commit -m 'code: çàãîòîâêà ïðîãðàììû'
[master (root-commit) 670da6a] code: çàãîòîâêà ïðîãðàììû
1 file changed, 0 insertions(+), 0 deletions(-)
create mode 100644 Source.cpp
10. Èçìåíåíèå èìåíè âåòêè
daria@mypc MINGW64 ~/Desktop/lab-02/alice/project (master)
$ git branch -m main
daria@mypc MINGW64 ~/Desktop/lab-02/alice/project (main)
$
11. Ñîçäàíèå êîììèòà äëÿ ñáîðêè ïðîåêòà:
daria @mypc MINGW64 ~/Desktop/lab-02/alice/project (main)
$ git add Project.sln
daria @mypc MINGW64 ~/Desktop/lab-02/alice/project (main)
$ git commit -m 'build: äîáàâëåíèå ôàéëà ïðîåêòà'
[main e96354f] build: äîáàâëåíèå ôàéëà ïðîåêòà
1 file changed, 31 insertions(+)
create mode 100644 Project.sln
12. Èçìåíåíèå ôàéëà, çàíåñ¸ííîãî ïîä Git:
daria@mypc MINGW64 ~/Desktop/lab-02/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: Source.cpp
Untracked files:
(use "git add <file>..." to include in what will be committed)
.vs/
Project.vcxproj
Project.vcxproj.filters
Project.vcxproj.user
no changes added to commit (use "git add" and/or "git commit -a")
 äàííîì ñëó÷àå Git îòìå÷àåò, ÷òî â îòñëåæèâàåìîì ôàéëå ïðîèçîøëè èçìåíåíèÿ, íî îíè íå áûëè çàíåñåíû â êîììèò.  ñëó÷àå ñ ñîçäàíèåì ôàéëà, êîãäà îí íàõîäèòñÿ â ñåêöèè “Changes to be committed” – èçìåíåíèÿ (çäåñü – ñîçäàíèå ôàéëà) ïðîèíäåêñèðîâàíû è ñîõðàíåíû.
13. Äîáàâëåíèå ñóììû:
daria@mypc MINGW64 ~/Desktop/lab-02/alice/project (main)
$ git add Source.cpp
daria@mypc MINGW64 ~/Desktop/lab-02/alice/project (main)
$ git commit -m "calc: ñóììà"
[main e725e82] calc: ñóììà
1 file changed, 14 insertions(+)
14. Äîáàâëåíèå ðàçíîñòè:
daria @mypc MINGW64 ~/Desktop/lab-02/alice/project (main)
$ git add Source.cpp
daria @mypc MINGW64 ~/Desktop/lab-02/alice/project (main)
$ git commit -m "calc: ðàçíîñòü"
[main a0abd05] calc: ðàçíîñòü
1 file changed, 1 insertion(+), 1 deletion(-)
15. Äîáàâëåíèå èãíîðèðóåìûõ ôàéëîâ:
Òåêñò ôàéëà .gitignore, ñîõðàí¸ííîãî â êîðíå ðåïîçèòàðèÿ:
/Project.vcxproj
/Project.vcxproj.filters
/Project.vcxproj.user
daria@mypc MINGW64 ~/Desktop/lab-02/alice/project (main)
$ git add .gitignore
daria@mypc MINGW64 ~/Desktop/lab-02/alice/project (main)
$ git commit -m "git: èãíîðèðîâàíèå ôàéëîâ"
[main f1c32c5] git: èãíîðèðîâàíèå ôàéëîâ
1 file changed, 3 insertions(+)
create mode 100644 .gitignore
16. Ïðîñìîòð æóðíàëà ðåïîçèòàðèÿ:
Êîììèò ïî òåìå build:
daria @mypc MINGW64 ~/Desktop/lab-02/alice/project (main)
$ git log --grep "build"
commit e96354fae06b02e9072ae59508ef76231ce556c4
Author: Alice (MachulinaDV) <MachulinaDV@mpei.ru>
Date: Thu Mar 23 20:43:35 2023 +0300
build: äîáàâëåíèå ôàéëà ïðîåêòà
Êîììèòû, çàòðàãèâàþùèå Source.cpp:
Äàðüÿ@mypc MINGW64 ~/Desktop/lab-02/alice/project (main)
$ git log -- Source.cpp
commit a0abd05489fc4889488791ec1e1efbc24838a4a7
Author: Alice (MachulinaDV) <MachulinaDV@mpei.ru>
Date: Thu Mar 23 21:12:20 2023 +0300
calc: ðàçíîñòü
commit e725e82a15a28b733ec40e503a5c4e8d3047e300
Author: Alice (MachulinaDV) <MachulinaDV@mpei.ru>
Date: Thu Mar 23 21:10:06 2023 +0300
calc: ñóììà
commit 670da6a7a11201596bd3761ef6369469e5741113
Author: Alice (MachulinaDV) <MachulinaDV@mpei.ru>
Date: Thu Mar 23 20:38:56 2023 +0300
code: çàãîòîâêà ïðîãðàììû
17. Ïðîñìîòð ïðåäïîñëåäíåãî êîììèòà:
daria@mypc MINGW64 ~/Desktop/lab-02/alice/project (main)
$ git show e725e
commit e725e82a15a28b733ec40e503a5c4e8d3047e300
Author: Alice (MachulinaDV) <MachulinaDV@mpei.ru>
Date: Thu Mar 23 21:10:06 2023 +0300
calc: ñóììà
diff --git a/Source.cpp b/Source.cpp
index e69de29..c1f7c80 100644
--- a/Source.cpp
+++ b/Source.cpp
@@ -0,0 +1,14 @@
+#include <iostream>
+#include <math.h>
+
+using namespace std;
+
+int main()
+{
+
+ cout << "Enter A and B: ";
+ int a, b;
+ cin >> a >> b;
+
+ cout << "A + B = " << a + b << '\n';
+}
\ No newline at end of file
18. Ïðîñìîòð èçìåíåíèé:
daria@mypc MINGW64 ~/Desktop/lab-02/alice/project (main)
$ git diff
diff --git a/Source.cpp b/Source.cpp – äâå âåðñèè îäíîãî ôàéëà. A – ñòàðàÿ, B – íîâàÿ.
index 928c845..3492c90 100644 – ìåòà-äàííûå ôàéëà. Äâà ïåðâûõ ÷èñëà — õåøè äâóõ ñðàâíèâàåìûõ ôàéëîâ. 100644 — âíóòðåííèé èäåíòèôèêàòîð ðåæèìà ôàéëà.
--- a/Source.cpp
+++ b/Source.cpp – Git ïðèïèñàë çíàê ìèíóñ (-) âåðñèè A è çíàê ïëþñ (+) âåðñèè B.
@@ -10,5 +10,5 @@ int main() – èç âåðñèè A èçâëå÷åíî 10 ñòðîê, íà÷èíàÿ ñî ñòðîêè 5. Èç âåðñèè B èçâëå÷åíî 10 ñòðîê, íà÷èíàÿ ñî ñòðîêè 5.
int a, b;
cin >> a >> b;
- cout << "A + B = " << a + b << '\n' << "A - B = " << a - b << '\n';
+ cout << "A + B = " << a + b << '\n' << "A - B = " << a - b << '\n' << "A * B = " << a * b << '\n';
} – êîä äî è ïîñëå èìçìåíåíèé
\ No newline at end of file – íåò ñòðîê ïîëñå èçìåí¸ííûõ.
19. Ñðàâíåíèå êîììèòîâ
daria@mypc MINGW64 ~/Desktop/lab-02/alice/project (main)
$ git diff HEAD~4 HEAD~2
diff --git a/Project.sln b/Project.sln
new file mode 100644
index 0000000..61dbbd5
--- /dev/null
+++ b/Project.sln
@@ -0,0 +1,31 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.28307.1758
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Project", "Project.vcxproj", "{DEB389E9-FDD2-4194-9708-1DE969B756D9}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|x64 = Debug|x64
+ Debug|x86 = Debug|x86
+ Release|x64 = Release|x64
+ Release|x86 = Release|x86
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {DEB389E9-FDD2-4194-9708-1DE969B756D9}.Debug|x64.ActiveCfg = Debug|x64
+ {DEB389E9-FDD2-4194-9708-1DE969B756D9}.Debug|x64.Build.0 = Debug|x64
+ {DEB389E9-FDD2-4194-9708-1DE969B756D9}.Debug|x86.ActiveCfg = Deb ug|Win32
+ {DEB389E9-FDD2-4194-9708-1DE969B756D9}.Debug|x86.Build.0 = Debug|Win32
+ {DEB389E9-FDD2-4194-9708-1DE969B756D9}.Release|x64.ActiveCfg = Release|x64
+ {DEB389E9-FDD2-4194-9708-1DE969B756D9}.Release|x64.Build.0 = Release|x64
+ {DEB389E9-FDD2-4194-9708-1DE969B756D9}.Release|x86.ActiveCfg = Release|Win32
+ {DEB389E9-FDD2-4194-9708-1DE969B756D9}.Release|x86.Build.0 = Release|Win32
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {FD124965-C430-4504-B52A-63389D0FE854}
+ EndGlobalSection
+EndGlobal
diff --git a/Source.cpp b/Source.cpp
index e69de29..c1f7c80 100644
--- a/Source.cpp
+++ b/Source.cpp
@@ -0,0 +1,14 @@
+#include <iostream>
+#include <math.h>
+
+using namespace std;
+
+int main()
+{
+
+ cout << "Enter A and B: ";
+ int a, b;
+ cin >> a >> b;
+
+ cout << "A + B = " << a + b << '\n';
+}
\ No newline at end of file
20. Äîáàâëåíèå ïðîèçâåäåíèÿ:
daria@mypc MINGW64 ~/Desktop/lab-02/alice/project (main)
$ git add Source.cpp
daria@mypc MINGW64 ~/Desktop/lab-02/alice/project (main)
$ git commit -m "calc: ïðîèçâåäåíèå"
[main 3df47c0] calc: ïðîèçâåäåíèå
1 file changed, 1 insertion(+), 1 deletion(-)
21. Îòêàò èçìåíåíèé:
daria@mypc MINGW64 ~/Desktop/lab-02/alice/project (main)
$ git reset --hard HEAD~1
HEAD is now at f1c32c5 git: èãíîðèðîâàíèå ôàéëîâ
daria@mypc MINGW64 ~/Desktop/lab-02/alice/project (main)
$ git checkout HEAD -- Source.cpp
22. Ãåíåðàöèÿ àóòåíòèôèêàöèîííîãî êëþ÷à:
Äàðüÿ@mypc MINGW64 ~/Desktop/lab-02/alice/project (main)
$ ssh-keygen
Generating public/private rsa key pair.
Enter file in which to save the key (/c/Users/user/.ssh/id_rsa):
Created directory '/c/Users/user/.ssh'.
Enter passphrase (empty for no passphrase):
Enter same passphrase again:
Your identification has been saved in /c/Users/user/.ssh/id_rsa
Your public key has been saved in /c/Users/user/.ssh/id_rsa.pub
The key fingerprint is:
SHA256:Sf0qHFwKcqMXF0K6sugQ3mKxeBLvM7xgxXKaMR72K+M Äàðüÿ@mypc
The key's randomart image is:
+---[RSA 3072]----+
| .o . |
| . . o |
| o = o o |
| . = B + . |
|oB.+o . S . |
|==#o . . . . |
|*@+o o . |
|=B= . . |
|.E== |
+----[SHA256]-----+
23. Çàãðóçêà êëþ÷à â àãåíò:
daria@mypc MINGW64 ~/Desktop/lab-02/alice/project (main)
$ eval $(ssh-agent -s)
Agent pid 514
daria @mypc MINGW64 ~/Desktop/lab-02/alice/project (main)
$ ssh-add
Enter passphrase for /c/Users/user/.ssh/id_rsa:
Identity added: /c/Users/user/.ssh/id_rsa (Äàðüÿ@mypc)
daria @mypc MINGW64 ~/Desktop/lab-02/alice/project (main)
$ cat ~/.ssh/id_rsa.pub
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDfj0TCEBSDLuAAEBRjPTxwzBkdCIndaI3IACr6wQ8DB3FozGCX7tBpMdgddXs1a0EnAi1QLn4JErqCYN9wp8ecxopdUjX2RczCKJ72YrAhRBxgP7/TgFiOeqCM7qH6nEJt9JZjEK0CAQeb39yTADf93Sd+ycwnKjri9caYG3isQiwA2kOhbN0olQJUL/ylG1nWZ9QFdqYI2D92iEKpGBBOgoDWaJ4saE+Jh23BOakbu84eJlp6d09SQECfa4PofmJpu0ErInHts79IXjEdiat0kQyeJNAAZo1+tQkirQAk/65gkeAYsPb2TVuP+e7wlYBRhXPEXNkZ5ZQAlsr5dMm2OxFnxqn7oZLbFWXJD3HA8KU+i9QGyu718OIGfdkuDkTfHOyCnBmKHpMBe5pp3CshSpI6TPHnkvMUMz18xlMzZiz+8LYRZEIJi6VJULgPFkvNjVZx9GVUdOMydHLkYIjnfIU43TSk9IWRpO/7tHvydh/d/XQUfpBqagnbxuUoJiU= daria @mypc
24. Çàãðóçêà ðåïîçèòîðèÿ íà ñåðâåð:
daria@mypc MINGW64 ~/Desktop/cs-lab02/alice/project (main)
$ git remote add origin git@uit.mpei.ru:MachulinaDV/cs-lab02.git
daria @mypc MINGW64 ~/Desktop/cs-lab02/alice/project (main)
$ git push -u origin main
Enter passphrase for key '/c/Users/user/.ssh/id_rsa':
Enumerating objects: 18, done.
Counting objects: 100% (18/18), done.
Delta compression using up to 4 threads
Compressing objects: 100% (16/16), done.
Writing objects: 100% (18/18), 2.25 KiB | 576.00 KiB/s, done.
Total 18 (delta 3), reused 0 (delta 0), pack-reused 0
remote: . Processing 1 references
remote: Processed 1 references in total
To uit.mpei.ru:MachulinaDV/cs-lab02.git
* [new branch] main -> main
branch 'main' set up to track 'origin/main'.
25. Ïîëó÷åíèå ïðîåêòà ñ ñåðâåðà:
daria@mypc MINGW64 ~/Desktop/cs-lab02/alice/project (main)
$ git remote -v
origin git@uit.mpei.ru:MachulinaDV/cs-lab02.git (fetch)
origin git@uit.mpei.ru:MachulinaDV/cs-lab02.git (push)
daria@mypc MINGW64 ~/Desktop/cs-lab02/bob
$ git clone git@uit.mpei.ru:MachulinaDV/cs-lab02.git project
Cloning into 'project'...
Enter passphrase for key '/c/Users/user/.ssh/id_rsa':
remote: Enumerating objects: 18, done.
remote: Counting objects: 100% (18/18), done.
remote: Compressing objects: 100% (16/16), done.
remote: Total 18 (delta 3), reused 0 (delta 0), pack-reused 0
Receiving objects: 100% (18/18), done.
Resolving deltas: 100% (3/3), done.
daria@mypc MINGW64 ~/Desktop/cs-lab02/bob
$ cd project
daria@mypc MINGW64 ~/Desktop/cs-lab02/bob/project (main)
$
daria @mypc MINGW64 ~/Desktop/cs-lab02/bob/project (main)
$ git config user.name 'Bob (MachulinaDV)'
daria @mypc MINGW64 ~/Desktop/cs-lab02/bob/project (main)
$ git config user.email 'MachulinaDV@mpei.com'
26. Ñîâìåñòíàÿ ðàáîòà íàä ïðîåêòîì:
daria@mypc MINGW64 ~/Desktop/cs-lab02/bob/project (main)
$ git add Source.cpp
daria@mypc MINGW64 ~/Desktop/cs-lab02/bob/project (main)
$ git commit -m "calc: +ïðîèçâåäåíèå"
[main 287808c] calc: +ïðîèçâåäåíèå
1 file changed, 1 insertion(+), 1 deletion(-)
daria@mypc MINGW64 ~/Desktop/cs-lab02/bob/project (main)
$ git log
commit 287808cdcad9214cfc3cfdd435237b98528ef304 (HEAD -> main)
Author: Bob (MachulinaDV) <MachulinaDV@mpei.com>
Date: Fri Mar 24 00:13:26 2023 +0300
calc: +ïðîèçâåäåíèå
(…)
daria@mypc MINGW64 ~/Desktop/cs-lab02/bob/project (main)
$ git push
Enter passphrase for key '/c/Users/user/.ssh/id_rsa':
Enumerating objects: 5, done.
Counting objects: 100% (5/5), done.
Delta compression using up to 4 threads
Compressing objects: 100% (3/3), done.
Writing objects: 100% (3/3), 316 bytes | 316.00 KiB/s, done.
Total 3 (delta 2), reused 0 (delta 0), pack-reused 0
remote: . Processing 1 references
remote: Processed 1 references in total
To uit.mpei.ru:MachulinaDV/cs-lab02.git
47568ca..287808c main -> main
daria@mypc MINGW64 ~/Desktop/cs-lab02/alice/project (main)
$ git fetch
Enter passphrase for key '/c/Users/user/.ssh/id_rsa':
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), 296 bytes | 17.00 KiB/s, done.
From uit.mpei.ru:MachulinaDV/cs-lab02
47568ca..287808c main -> origin/main
daria @mypc MINGW64 ~/Desktop/cs-lab02/alice/project (main)
$ git pull --ff-only
Enter passphrase for key '/c/Users/user/.ssh/id_rsa':
Updating 47568ca..287808c
Fast-forward
Source.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Ñàìîñòîÿòåëüíîå:
daria@mypc MINGW64 ~/Desktop/cs-lab02/alice/project (main)
$ git add Source.cpp
daria@mypc MINGW64 ~/Desktop/cs-lab02/alice/project (main)
$ git commit -m "calc: äåëåíèå"
[main a89ab56] calc: äåëåíèå
1 file changed, 1 insertion(+), 1 deletion(-)
daria@mypc MINGW64 ~/Desktop/cs-lab02/alice/project (main)
$ git push
Enter passphrase for key '/c/Users/user/.ssh/id_rsa':
Enumerating objects: 5, done.
Counting objects: 100% (5/5), done.
Delta compression using up to 4 threads
Compressing objects: 100% (3/3), done.
Writing objects: 100% (3/3), 328 bytes | 328.00 KiB/s, done.
Total 3 (delta 2), reused 0 (delta 0), pack-reused 0
remote: . Processing 1 references
remote: Processed 1 references in total
To uit.mpei.ru:MachulinaDV/cs-lab02.git
287808c..a89ab56 main -> main
daria@mypc MINGW64 ~/Desktop/cs-lab02/bob/project (main)
$ git fetch
Enter passphrase for key '/c/Users/user/.ssh/id_rsa':
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), 308 bytes | 17.00 KiB/s, done.
From uit.mpei.ru:MachulinaDV/cs-lab02
287808c..a89ab56 main -> origin/main
daria@mypc MINGW64 ~/Desktop/cs-lab02/bob/project (main)
$ git pull --ff-only
Enter passphrase for key '/c/Users/user/.ssh/id_rsa':
Updating 287808c..a89ab56
Fast-forward
Source.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
27. Ðàçðåøåíèå êîíôëèêòîâ:
daria@mypc MINGW64 ~/Desktop/cs-lab02/alice/project (main)
$ git add Source.cpp
daria @mypc MINGW64 ~/Desktop/cs-lab02/alice/project (main)
$ git commit -m "search: ìàêñèìóì"
[main 6ff1d1d] search: ìàêñèìóì
1 file changed, 5 insertions(+), 2 deletions(-)
daria @mypc MINGW64 ~/Desktop/cs-lab02/alice/project (main)
$ git push
Enter passphrase for key '/c/Users/user/.ssh/id_rsa':
Enumerating objects: 5, done.
Counting objects: 100% (5/5), done.
Delta compression using up to 4 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
remote: . Processing 1 references
remote: Processed 1 references in total
To uit.mpei.ru:MachulinaDV/cs-lab02.git
a89ab56..6ff1d1d main -> main
daria @mypc MINGW64 ~/Desktop/cs-lab02/bob/project (main)
$ git add Source.cpp
daria @mypc MINGW64 ~/Desktop/cs-lab02/bob/project (main)
$ git commit -m "search: ìèíèìóì"
[main 49aa957] search: ìèíèìóì
1 file changed, 5 insertions(+), 2 deletions(-)
daria @mypc MINGW64 ~/Desktop/cs-lab02/bob/project (main)
$ git push
Enter passphrase for key '/c/Users/user/.ssh/id_rsa':
To uit.mpei.ru:MachulinaDV/cs-lab02.git
! [rejected] main -> main (fetch first)
error: failed to push some refs to 'uit.mpei.ru:MachulinaDV/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.
daria@mypc MINGW64 ~/Desktop/cs-lab02/bob/project (main)
$ git log --oneline --decorate --all --graph
* 49aa957 (HEAD -> main) search: ìèíèìóì
| * 6ff1d1d (origin/main, origin/HEAD) search: ìàêñèìóì
|/
* a89ab56 calc: äåëåíèå
* 287808c calc: +ïðîèçâåäåíèå
* 47568ca calc: ïðîèçâåäåíèå
* f1c32c5 git: èãíîðèðîâàíèå ôàéëîâ
* a0abd05 calc: ðàçíîñòü
* e725e82 calc: ñóììà
* e96354f build: äîáàâëåíèå ôàéëà ïðîåêòà
* 670da6a code: çàãîòîâêà ïðîãðàììû
daria@mypc MINGW64 ~/Desktop/cs-lab02/bob/project (main)
$ git rebase origin/main
Auto-merging Source.cpp
CONFLICT (content): Merge conflict in Source.cpp
error: could not apply 49aa957... search: ìèíèìóì
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 49aa957... search: ìèíèìóì
daria@mypc MINGW64 ~/Desktop/cs-lab02/bob/project (main|REBASE 1/1)
$ git add Source.cpp
daria @mypc MINGW64 ~/Desktop/cs-lab02/bob/project (main|REBASE 1/1)
$ git rebase --continue
Successfully rebased and updated refs/heads/main.
daria @mypc MINGW64 ~/Desktop/cs-lab02/bob/project (main)
$ git log --oneline --decorate --all --graph
* 0930f74 (HEAD -> main) search: ìèíèìóì
* 6ff1d1d (origin/main, origin/HEAD) search: ìàêñèìóì
* a89ab56 calc: äåëåíèå
* 287808c calc: +ïðîèçâåäåíèå
* 47568ca calc: ïðîèçâåäåíèå
* f1c32c5 git: èãíîðèðîâàíèå ôàéëîâ
* a0abd05 calc: ðàçíîñòü
* e725e82 calc: ñóììà
* e96354f build: äîáàâëåíèå ôàéëà ïðîåêòà
* 670da6a code: çàãîòîâêà ïðîãðàììû
daria@mypc MINGW64 ~/Desktop/cs-lab02/bob/project (main)
$ git push
28. Èñïîëüçîâàíèå âåòîê:
daria @mypc MINGW64 ~/Desktop/cs-lab02/alice/project (main)
$ git checkout -b double
daria @mypc MINGW64 ~/Desktop/cs-lab02/bob/project (double)
$ git add Source.cpp
daria @mypc MINGW64 ~/Desktop/cs-lab02/bob/project (double)
$ git commit -m "data: èçìåíåíèå òèïà"
daria @mypc MINGW64 ~/Desktop/cs-lab02/alice/project (double)
$ git checkout main
Switched to branch 'main'
Your branch is up to date with 'origin/main'.
daria @mypc MINGW64 ~/Desktop/cs-lab02/alice/project (main)
$ git fetch
daria @mypc MINGW64 ~/Desktop/cs-lab02/alice/project (main)
$ git pull --ff-only
daria@mypc MINGW64 ~/Desktop/cs-lab02/alice/project (main)
$ git log --oneline --decorate --all --graph
* 4d39183 (HEAD -> main, origin/main) Merge branch 'double'
|\
| * 10a168f (origin/double, double) data: èçìåíåíèå òèïà
* | d18cf6a data: èçìåíåíèå òèïà
* | 0930f74 search: ìèíèìóì
* | 6ff1d1d search: ìàêñèìóì
|/
* a89ab56 calc: äåëåíèå
* 287808c calc: +ïðîèçâåäåíèå
* 47568ca calc: ïðîèçâåäåíèå
* f1c32c5 git: èãíîðèðîâàíèå ôàéëîâ
* a0abd05 calc: ðàçíîñòü
* e725e82 calc: ñóììà
* e96354f build: äîáàâëåíèå ôàéëà ïðîåêòà
* 670da6a code: çàãîòîâêà ïðîãðàììû

19
Source.cpp
Unescape Просмотреть файл

@ -0,0 +1,19 @@
#include <iostream>
#include <math.h>
using namespace std;
int main()
{
cout << "Enter A and B: ";
double a, b, max, min;
cin >> a >> b;
if (a > b)
a = max;
b = min;
cout << "A + B = " << a + b << '\n' << "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;
}
Редактирование Предпросмотр
Загрузка…
Отмена
Сохранить