DobrovolskaY
/
cs-lab02
1
0
Форкнуть 0
Код Задачи Запросы на слияние Пакеты Проекты Релизы Вики Активность
Вы не можете выбрать более 25 тем Темы должны начинаться с буквы или цифры, могут содержать дефисы(-) и должны содержать не более 35 символов.
Ветки Теги
${ item.name }
Создать тег ${ searchTerm }
Создать ветку ${ searchTerm }
из '528f704e9e'
${ noResults }
cs-lab02/otchet2.txt

1168 строки
39 KiB
Plaintext
Исходник Вина История

Îò÷åò ïî ëàáîðàòîðíîé ðàáîòå ¹ 2 "Ñèñòåìà êîíòðîëÿ âåðñèé Git"
Âûïîëíèëà: Äîáðîâîëüñêà Å.
Ãðóïïà: À-03-23
Ïðîâåðèë: Êîçëþê Ä. À.
Ïðèìå÷àíèå: ðàáîòà âûïîëíÿëàñü íà Windows.
1. Ñîçäàëà íà ðàáî÷åì ñòîëå êàòàëîã lab2 è çàïóñòèëà â íåì Git Bash, ïðèãëàøåíèå:
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2
$
2. Ïðîñìîòðåëà ôàéëû â ðàáî÷åì êàòàëîãå êîìàíäîé ls.  êàòàëîãå ïóñòî.
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2
$ ls
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2
$
3. Ñîçäàëà â ïàïêå êàòàëîãè Àëèñû è Áîáà, èçó÷èëà êîìàíäó cd.
Ñíà÷àëà ïåðåøëà â êàòàëîã Áîáà, äàëåå íàõîäÿñü â êàòàëîãå Áîáà
õîòåëà ïåðåéòè â êàòàëîã Àëèñà, íå ïåðåéäÿ îáðàòíî â êàòàëîã lab2.
Git ñîîáùèë, ÷òî â êàòàëîãå Áîáà íåò êàòàëîãà Àëèñû.
Õîòåëà ïåðåéòè â êàòàëîã âûøå lab2. Ñíà÷àëà êîìàíäà cd ..
áûëà ââåäåíà íåêîððåêòíî áåç ïðîáåëà, Git ñîîáùèë, ÷òî òàêîé êîìàíäû íå ñóùåñòâóåò.
Äàëåå óäà÷íî ïåðåøëà â êàòàëîã âûøå è èç íåãî ïåðåøëà â êàòàëîã Àëèñà.
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2
$ mkdir alice
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2
$ mkdir bob
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2
$ cd bob
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/bob
$ cd alice
bash: cd: alice: No such file or directory
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/bob
$ cd..
bash: cd..: command not found
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/bob
$ cd ..
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2
$ cd alice
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice
$
4. Ñîçäàëà â êàòàëîãå Àëèñû ïàïêó projec è ïåðåøëà â íåå
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice
$ mkdir projec
t
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice
$ cd projec
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec
$
5. Ïåðåøëà èç êàòàëîãà projec ââåðõ è îáðàòíî.
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec
$ cd ..
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice
$ cd projec
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec
$
6. Èíèöèàëèçèðîâàëà ðåïîçèòàðèé. Ïðè óñòàíîâêå Git ÿ èçíà÷àëüíî íàñòðîèëà èìÿ âåòêè ïî óìîë÷àíèþ main.
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec
$ git init
Initialized empty Git repository in C:/Users/Ëèçà/OneDrive/Desktop/lab2/alice/projec/.git/
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$
7. Ïðîñìîòðåëà ñîäåðæàíèå ïàïêè. Òàê êàê êàòàëîã Gita ñêðûòûé, ïîñìîòðåëè åãî êîìàíäîé ls -A. Óâèäåëè, ÷òî äàííûå â êàòàëîãå .git.
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$ ls
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$ ls -A
.git/
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$
8. Äëÿ ëîêàëüíûõ íàñòðîåê íàñòðàèâàþ ðåïîçèòàðèé Àëèñû - äàþ èìÿ, ÷òîáû êîììèòû áûëè îò èìåíè Àëèñû
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$ git config user.name "Alice (DobrovolskaY)"
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$ git config user.email "DobrovolskaY@mpei.ru"
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$
9. Çàïóñòèëà ÊîäÁëîêñ è ñîçäàëà ïðîåêò â ïåðîçèòàðèè Àëèñû. Ïðîâåðèëà ñòàòóñ ðàáî÷åé êîïèè.
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$ git status
On branch main
No commits yet
Untracked files:
(use "git add <file>..." to include in what will be committed)
bin/
main.cpp
obj/
projec.cbp
nothing added to commit but untracked files present (use "git add" to track)
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$
Git ñîîáùàåò, ÷òî:
 âåòêå main
ïîêà íåò íèêàêèõ êîììèòîâ (òî åñòü ìû åùå íå ôèêñèðîâàëè èçìåíåíèÿ)
Ïåðå÷èñëÿåò íåîòñëåæèâàåìûå ôàéëû
Ïèøåò çàìåòêó, ÷òî ìû ìîæåì èñïîëüçîâàòü git add êîìàíäó, ÷òîáû âêëþ÷èòü ôàéë, â êîòîðûé áóäåò ñäåëàí êîììèò.
*Ïåðå÷èñëåíèå íåîòñëåæèâàåìûõ ôàéëîâ*
Ñîîáùàåò, ÷òî äëÿ êîììèòà (ôèêñàöèè) íè÷åãî íå äîáàâëåíî, íî åñòü íåîòñåæèâàåìûå ôàéëû (ïîäñêàçûâàåò, ÷òî äëÿ îòñëåæèâàíèÿ íóæíî èñïîëüçîâàòü git add)
10. Äîáàâèëà â èíäåêñ ôàéë main.cpp è ïðîñìîòðåëà ñòàòóñ ðåïîçèòàðèÿ(â ãèò)
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$ git add main.cpp
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$ git status
On branch main
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/
projec.cbp
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$
Git ñîîáùàåò, ÷òî:
 âåòêå main
ïîêà íåò íèêàêèõ êîììèòîâ (òî åñòü ìû åùå íå ôèêñèðîâàëè èçìåíåíèÿ)
Ïîêàçûâàåò èçìåíåíèÿ, êîòîðûå íóæíî çàôèêñèðîâàòü
(Ïîäñêàçûâàåò, ÷òî äëÿ îòìåíû çàãðóçè (óñëàíîâêè äëÿ îòñëåæèâàíèÿ) ôàéëà ìîæíî èñïîëüçîâàòü êîìàíäó git rm --cached <file>...
Ãîâîðèò, ÷òî ïîÿâèëñÿ íîâûé îòñëåæèâàåìûé ôàéë main.cpp
Ïåðå÷èñëÿåò îñòàâøèåñÿ íå îòñëåæèâàåìûå ôàéëû (êàê â ïðåäûäóùåì äåéñòâèå)
11. Âûïîëíèëà êîììèò ñ ôàéëîì è ñîîáùåíèåì
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$ git commit -m "code: çàãîòîâêà ïðîãðàììû"
[main (root-commit) 3df1f3a] code: çàãîòîâêà ïðîãðàììû
1 file changed, 9 insertions(+)
create mode 100644 main.cpp
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$
12. Äîáàâèëà ôàéë projec.cbp â èíäåêñ è âûïîëíèëà êîììèò ñ íèì è ñîîáùåíèåì
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$ git add projec.cbp
warning: in the working copy of 'projec.cbp', LF will be replaced by CRLF the next time Git touches it
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$ git commit -m "build: äîáàâëåí ôàéë ïðîåêòà"
[main eb9a6f8] build: äîáàâëåí ôàéë ïðîåêòà
1 file changed, 38 insertions(+)
create mode 100644 projec.cbp
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$
Ãèò âûâåë ïðåäóïðåæäåíèå î òîì, ÷òî äëÿ óäîáíîé ðàáîòû ñ ôàéëîì îí áóäåò
èçìåíÿòü åãî â ðàáî÷åé êîïèè, êîãäà áóäåò ñ íèì ÷òî-ëèáî äåëàòü
13. Ïîñëå èçìåíåíèÿ òåëà ôóíêöèè main â ïðîãðàììå, ïîñìîòðåëà ñîñòîÿíèå ðåïîçèòàðèÿ
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (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/
projec.depend
no changes added to commit (use "git add" and/or "git commit -a")
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$
â îòëè÷àå îò ñëó÷àÿ, êîãäà ÿ äîáàâëÿëà íîâûé ôàéë, òåïåðü ïðè èçìåíåíèè
ýòîãî ôàéëà è ïîñëå ïðîâåðêè ñòàòóñà ãèò ñîîáùàåò:
÷òî èçìåíåíèÿ íå ïîñòàâëåíû â êîììèò
*ïðåäëàãàåò îáíîâèòü òî, ÷òî áóäåò çàôèêñèðîâàíî*
*ïðåäëàãàåò îòìåíèòü èçìåíåíèÿ â ðàáî÷åì êàòàëîãå*
ïèøåò, êàêîé ôàéë áûë èçìåíåí
ïåðå÷èñëÿåò íåîòñëåæèâàåìûå ôàéëû
ïèøåò, ÷òî íèêàêèå èçìåíåíèÿ íå äîáàâëåíû â êîììèò (ôèêñàöèþ)
14. Ïîñëå èçìåíåíèÿ òåëà êîäà çàêîììèòèëà èçìåíåíèÿ ïåðâûì ñïîñîáîì
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$ git add main.cpp
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$ git commit -m "code: èçìåíåíî òåëî êîäà"
[main b0b79d1] code: èçìåíåíî òåëî êîäà
1 file changed, 5 insertions(+), 5 deletions(-)
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$
15. Äîáàâèëà â êîä âûâîä ñóììû è çàêîììèòèëà èçìåíåíèÿ âòîðûì ñïîñîáîì
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$ git add -u
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$ git commit -m "code: äîáàâëåíà ñòðîêà êîäà"
[main 1a3b1b1] code: äîáàâëåíà ñòðîêà êîäà
1 file changed, 1 insertion(+)
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$
16. Äîáàâèëà â êîä âûâîä ðàçíîñòè è â îäèí øàã çàêîììèòèëà èçìåíåíèÿ
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$ git commit -a -m "code: äîáàâëåíà ñòðîêà âûâîäà ðàçíîñòè"
[main bb7fb2e] code: äîáàâëåíà ñòðîêà âûâîäà ðàçíîñòè
1 file changed, 2 insertions(+), 1 deletion(-)
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$
17. Â êîäáëîêñ ñîçäàëà íîâûé ôàéë ïîä íàçâàíèåì .gitignore è çàïèñàëà â
åãî ñòðîêó \bin (êîñàÿ ÷åðòà äëÿ óêàçàíèÿ, ÷òî íàñ èíòåðåñóåò òîëüêî bin
â projec, à íå âåçäå. ×åðòà - ïóòü îò êàòàëîãà projec). Äàëåå ïðîñìîòðåëà
ñòàòóñ è ãèò ïîêàçàë, ÷òî bin áîëüøå íå îòîáðàæàåòñÿ, òî åñòü èãíîðèðóåòñÿ.
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$ git status
On branch main
Untracked files:
(use "git add <file>..." to include in what will be committed)
.gitignore
obj/
projec.depend
nothing added to commit but untracked files present (use "git add" to track)
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$
18. Òàêæå âíåñëà áèíàðíûå ôàéëû obj è projec.depend â èãíîðèðîâàíèÿ è
ïðîâåðèëà ñòàòóñ, óáåäèâøèñü, ÷òî îíè áîëüøå íå îòîáðàæàþòñÿ
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (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)
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$
19. Ñîçäàëà êîììèò ñ ôàéëîì .gitignore
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$ git add .gitignore
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$ git commit -m "git: óêàçàëè èãíîðèðîâàíèå ïðèñóòñòâèå äèàëîãîâ"
[main 2bf7ebf] git: óêàçàëè èãíîðèðîâàíèå ïðèñóòñòâèå äèàëîãîâ
1 file changed, 4 insertions(+)
create mode 100644 .gitignore
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$
20. Ïðîñìîòðåëà æóðíàë ðåïîçèòàðèÿ. Ãèò ïîêàçûâàåò õýø êàæäîãî êîììèòà,
âåòêó, àâòîðà, äàòó è äàííûé ìíîé êîììåíòàðèé
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$ git log
commit 2bf7ebffe0b209a59345ed618855320aaeb1643a (HEAD -> main)
Author: Alice (DobrovolskaY) <DobrovolskaY@mpei.ru>
Date: Tue Mar 26 18:09:18 2024 +0200
git: óêàçàëè èãíîðèðîâàíèå ïðèñóòñòâèå äèàëîãîâ
commit bb7fb2e635c31fdf2214b190fec09f7fb4fb4c63
Author: Alice (DobrovolskaY) <DobrovolskaY@mpei.ru>
Date: Tue Mar 26 17:31:56 2024 +0200
code: äîáàâëåíà ñòðîêà âûâîäà ðàçíîñòè
commit 1a3b1b1dcd57d732c9a68412d58623d6378ef7e6
Author: Alice (DobrovolskaY) <DobrovolskaY@mpei.ru>
Date: Tue Mar 26 17:29:34 2024 +0200
code: äîáàâëåíà ñòðîêà êîäà
commit b0b79d1e8996662d444b8b1b3e70a3a1f3578571
Author: Alice (DobrovolskaY) <DobrovolskaY@mpei.ru>
Date: Tue Mar 26 17:26:18 2024 +0200
code: èçìåíåíî òåëî êîäà
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$
21. Ïðîñìîòðåëà ôàéëà, èçìåíåííûå â êîììèòàõ. Ãèò ïîêàçûâàåò íàçâàíèå ôàéëà
è ñêîëüêî áûëî ñäåëàíî âñòàâîê è óäàëåíèé
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$ git log --stat
commit 2bf7ebffe0b209a59345ed618855320aaeb1643a (HEAD -> main)
Author: Alice (DobrovolskaY) <DobrovolskaY@mpei.ru>
Date: Tue Mar 26 18:09:18 2024 +0200
git: óêàçàëè èãíîðèðîâàíèå ïðèñóòñòâèå äèàëîãîâ
.gitignore | 4 ++++
1 file changed, 4 insertions(+)
commit bb7fb2e635c31fdf2214b190fec09f7fb4fb4c63
Author: Alice (DobrovolskaY) <DobrovolskaY@mpei.ru>
Date: Tue Mar 26 17:31:56 2024 +0200
code: äîáàâëåíà ñòðîêà âûâîäà ðàçíîñòè
main.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
commit 1a3b1b1dcd57d732c9a68412d58623d6378ef7e6
Author: Alice (DobrovolskaY) <DobrovolskaY@mpei.ru>
Date: Tue Mar 26 17:29:34 2024 +0200
code: äîáàâëåíà ñòðîêà êîäà
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$
Äëÿ ïîñëåäíåãî êîììèòà ãèò ïîêàçûâàåò, ÷òî ýòî êîììèò, ñ óêàçàííûì õýøîì,
àâòîð: Àëèñà (Äîáðîâîëüñêà Å) (òîò ïîëüçîâàòåëü, ÷òî ñäåëàë êîììèò) è ïî÷òà àâòîðà
äàòà: *äåíü íåäåëè*, *äàòà*, *âðåìÿ*, *ãîä*, *÷àñîâîé ïîÿñ*
*êîììåíòàðèé ê êîììèòó*
22. Ïðîñìîòðåëà êîììèòû ïî îäíîé ñòðîêå â êîìïàêòíîì âèäå.
Ãèò âûâîäèò õýø è êîììåíòàðèé
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$ git log --oneline
2bf7ebf (HEAD -> main) git: óêàçàëè èãíîðèðîâàíèå ïðèñóòñòâèå äèàëîãîâ
bb7fb2e code: äîáàâëåíà ñòðîêà âûâîäà ðàçíîñòè
1a3b1b1 code: äîáàâëåíà ñòðîêà êîäà
b0b79d1 code: èçìåíåíî òåëî êîäà
eb9a6f8 build: äîáàâëåí ôàéë ïðîåêòà
3df1f3a code: çàãîòîâêà ïðîãðàììû
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$
23. Ïîïðîáîâàëà òàêæå êîìàíäó git log --decorate, êîòîðàÿ ïîêàçûâàåò ññûëêè,
êîíöû âåòîê è òýãè. Ãèò âûâåë òî æå, ÷òî è â ïðåäûäóùåé êîìàíäå
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$ git log --oneline --decorate
2bf7ebf (HEAD -> main) git: óêàçàëè èãíîðèðîâàíèå ïðèñóòñòâèå äèàëîãîâ
bb7fb2e code: äîáàâëåíà ñòðîêà âûâîäà ðàçíîñòè
1a3b1b1 code: äîáàâëåíà ñòðîêà êîäà
b0b79d1 code: èçìåíåíî òåëî êîäà
eb9a6f8 build: äîáàâëåí ôàéë ïðîåêòà
3df1f3a code: çàãîòîâêà ïðîãðàììû
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$
24. Ïîïðîáîâàëà êîìàíäó git log --oneline --decorate --all --graph.
Ãèò âûâåë êîììåíòàðèè êîììèòîâ ñî çâåçäî÷êàìè âíà÷àëå
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$ git log --oneline --decorate --all --graph
* 2bf7ebf (HEAD -> main) git: óêàçàëè èãíîðèðîâàíèå ïðèñóòñòâèå äèàëîãîâ
* bb7fb2e code: äîáàâëåíà ñòðîêà âûâîäà ðàçíîñòè
* 1a3b1b1 code: äîáàâëåíà ñòðîêà êîäà
* b0b79d1 code: èçìåíåíî òåëî êîäà
* eb9a6f8 build: äîáàâëåí ôàéë ïðîåêòà
* 3df1f3a code: çàãîòîâêà ïðîãðàììû
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$
25. Ïðîñìîòðåëà êîììèòû ñ êîììåíòàðèÿìè, îòíîñÿùèìèñÿ ê build
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$ git log --grep "build:"
commit eb9a6f8fd6c7df429c15f443585b45b98e79af29
Author: Alice (DobrovolskaY) <DobrovolskaY@mpei.ru>
Date: Tue Mar 26 17:00:49 2024 +0200
build: äîáàâëåí ôàéë ïðîåêòà
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$
26. Ïðîñìîòðåëà êîììèòû, îòíîñÿùèåñÿ ê ôàéëó projec.cbp
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$ git log -- projec.cbp
commit eb9a6f8fd6c7df429c15f443585b45b98e79af29
Author: Alice (DobrovolskaY) <DobrovolskaY@mpei.ru>
Date: Tue Mar 26 17:00:49 2024 +0200
build: äîáàâëåí ôàéë ïðîåêòà
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$
27. Ïðîñìîòðåëà ïðåäïîñëåäíèé êîììèò ïî õýøó, îòñòóïà îò òåêóùåãî âðåìåíè è âåòêå
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$ git show bb7fb2e635c31fdf2214b190fec09f7fb4fb4c63
commit bb7fb2e635c31fdf2214b190fec09f7fb4fb4c63
Author: Alice (DobrovolskaY) <DobrovolskaY@mpei.ru>
Date: Tue Mar 26 17:31:56 2024 +0200
code: äîáàâëåíà ñòðîêà âûâîäà ðàçíîñòè
diff --git a/main.cpp b/main.cpp
index 1aeec6a..c0d464f 100644
--- a/main.cpp
+++ b/main.cpp
@@ -5,6 +5,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';
}
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$ git show HEAD~1
commit bb7fb2e635c31fdf2214b190fec09f7fb4fb4c63
Author: Alice (DobrovolskaY) <DobrovolskaY@mpei.ru>
Date: Tue Mar 26 17:31:56 2024 +0200
code: äîáàâëåíà ñòðîêà âûâîäà ðàçíîñòè
diff --git a/main.cpp b/main.cpp
index 1aeec6a..c0d464f 100644
--- a/main.cpp
+++ b/main.cpp
@@ -5,6 +5,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';
}
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$ git show main~1
commit bb7fb2e635c31fdf2214b190fec09f7fb4fb4c63
Author: Alice (DobrovolskaY) <DobrovolskaY@mpei.ru>
Date: Tue Mar 26 17:31:56 2024 +0200
code: äîáàâëåíà ñòðîêà âûâîäà ðàçíîñòè
diff --git a/main.cpp b/main.cpp
index 1aeec6a..c0d464f 100644
--- a/main.cpp
+++ b/main.cpp
@@ -5,6 +5,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';
}
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$
28. Äîáàâèëà â êîäáëîêñå ïå÷àòü ïðîèçâåäåíèÿ ÷èñåë
29. Ïðîñìîòðåëà èçìåíåíèÿ â ðàáî÷åé êîïèè
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$ git diff
diff --git a/main.cpp b/main.cpp
index c0d464f..8d914eb 100644
--- a/main.cpp
+++ b/main.cpp
@@ -6,6 +6,7 @@ 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-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$
ãèò óêàçûâàåò íà èçìåíåíèÿ â ôàéëå main.cpp
ñîîáùàåò èíôîðìàöèþ îá èíäåêñàõ èçìåíåííûõ ôàéëîâ
óêàçûâàåò íà èñõîäíûé ôàéë äî èçìåíåíèé
óêàçûâàåò íà èçìåíåíèÿ â ôàéëå
ïîêàçûâàåò, ÷òî èçìåíåíèÿ áûëè â ñòðîêàç 6 è 7, - è + ïîêàçûâàåò êàêèå
ñòðîêè äîáàâëåíû.
 îáùåì êîìàíäà ïîêàçûâàåò ðàçëè÷èÿ ìåæäó òåêóùèì ñîñòîÿíèåì è ïîñëåäíèì êîììèòîì
30. Ïðîñìîòðåëà èçìåíåíèÿ ìåæäó ïåðâûì êîììèòîì è êîììèòîâ âíåñåíèÿ ðàçíîñòè
$ git diff HEAD~4 HEAD~1
diff --git a/main.cpp b/main.cpp
index b4392ec..c0d464f 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,9 +1,11 @@
#include <iostream>
-
using namespace std;
-int main()
-{
- cout << "Hello world!" << endl;
- return 0;
+int main(){
+cout << "Enter A and B: ";
+int a, b;
+cin >> a >> b;
+cout << "A + B = " << a + b << '\n'
+ << "A - B = " << a - b << '\n';
}
+
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$
31. Äîáàâèëà êîììèò ôàéëà ìýéí ñ êîììåíòàðèåì è îòêàòèëà èçìåíåíèÿ â ðàáî÷åé
êîïèè îáðàòíî äî ïðåäûäóùåãî ñîñòîÿíèÿ êîììèòà
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$ git add main.cpp
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$ git commit -m "code: äîáàâëåíèå ñòðîêè ïðîèçâåäåíèÿ"
[main 1cf7645] code: äîáàâëåíèå ñòðîêè ïðîèçâåäåíèÿ
1 file changed, 2 insertions(+), 1 deletion(-)
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$ git reset --hard HEAD~1
HEAD is now at 2bf7ebf git: óêàçàëè èãíîðèðîâàíèå ïðèñóòñòâèå äèàëîãîâ
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$
32. Â êîäáëîêñå ïåðåä íàçâàíèåì ôóíêöèè äîáàâèëà êîììåíòàðèé è ñîõðàíèëà.
Äàëåå óäàëèëà ýòî èçìåíåíèå ïîñðåäñòâîì îòêàòà ôàéëà ê ñîñòîÿíèþ ïîñëåäíåãî
êîììèòà (òî åñòü HEAD)
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$ git checkout HEAD -- main.cpp
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$
33.Ñîçäàëà ïàðó êëþ÷åé (îòêðûòûé è ïðèâàòíûé), ïðèäóìàëà ïàðîëü, çàïóñòèëà
ïðîãðàììó-àãåíò,êîòîðàÿ ïðåäîñòàâëÿåò êëþ÷ äðóãèì ïðîãðàììàì (÷òîáû ìîæíî
áûëî ââîäèòü ïàðîëü îäèí ðàç). Çàãðóçèëà êëþ÷ è îòîáðàçèëà îòêðûòûé êëþ÷.
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (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\233\320\270\320\267\320\260/.ssh'.
Enter passphrase (empty for no passphrase):
Enter same passphrase again:
Your identification has been saved in /c/Users/Ëèçà/.ssh/id_ed25519
Your public key has been saved in /c/Users/Ëèçà/.ssh/id_ed25519.pub
The key fingerprint is:
SHA256:m26fPVmOM8tPSIYLWLwmqTOKKlDWNF1WKWfCv1WY0tE Ëèçà@DESKTOP-EF1MFMT
The key's randomart image is:
+--[ED25519 256]--+
| . oo..o.= |
| o .o+ = + E |
| o . o* . . |
| o . + .... |
| o + S .oo |
|. . o +.+ .. |
|. + o . .=. |
|.. . o .. +*.. |
|= . ...o +*. |
+----[SHA256]-----+
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$ eval $(ssh-agent -s)
Agent pid 447
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$ ssh-add
Enter passphrase for /c/Users/Ëèçà/.ssh/id_ed25519:
Identity added: /c/Users/Ëèçà/.ssh/id_ed25519 (Ëèçà@DESKTOP-EF1MFMT)
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$ cat ~/.ssh/id_ed25519.pub
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIAbaBd72hOIIUUx1ciwNxVSLKnCAAk8oatLYJ8nOFA0 Ëèçà@DESKTOP-EF1MFMT
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$
34. Äîáàâèëà îòêðûòûé êëþ÷ â ñïèñîê îòêðûòûõ êëþ÷åé ñâîåé ó÷åòíîé çàïèñè
35. Ñîçäàëà ðåïîçèòàðèé
36. Îòïðàâèëà ôàéëû ïðîåêòà íà ñåðâåð
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$ git remote add origin git@uit.mpei.ru:DobrovolskaY/cs-lab02.git
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$ git push -u origin main
ssh: Could not resolve hostname uit.mpei.ru: Name or service not known
fatal: Could not read from remote repository.
Please make sure you have the correct access rights
and the repository exists.
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$ git remote set-url origin git.@uit.mpei.ru:DobrovolskaY/cs-lab02.git
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$ git push -u origin main
ssh: Could not resolve hostname uit.mpei.ru: Name or service not known
fatal: Could not read from remote repository.
Please make sure you have the correct access rights
and the repository exists.
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$ git remote add origin http://uit.mpei.ru/git/DobrovolskaY/cs-lab02.git
error: remote origin already exists.
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$ git remote set-url origin http://uit.mpei.ru/git/DobrovolskaY/cs-lab02.git
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$ git push -u origin main
fatal: unable to access 'http://uit.mpei.ru/git/DobrovolskaY/cs-lab02.git/': Could not resolve host: uit.mpei.ru
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$ git remote add origin http://uit.mpei.ru/git/DobrovolskaY/cs-lab02.git
error: remote origin already exists.
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$ git push -u origin main
warning: auto-detection of host provider took too long (>2000ms)
warning: see https://aka.ms/gcm/autodetect for more information.
warning: auto-detection of host provider took too long (>2000ms)
warning: see https://aka.ms/gcm/autodetect for more information.
Enumerating objects: 18, done.
Counting objects: 100% (18/18), done.
Delta compression using up to 8 threads
Compressing objects: 100% (16/16), done.
Writing objects: 100% (18/18), 2.34 KiB | 600.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 http://uit.mpei.ru/git/DobrovolskaY/cs-lab02.git
* [new branch] main -> main
branch 'main' set up to track 'origin/main'.
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$
37. Â ïàïêå áîáà êëîíèðîâàëà ïðîåêò projec
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/bob
$ git clone http://uit.mpei.ru/git/DobrovolskaY/cs-lab02.git projec
Cloning into 'projec'...
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.
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/bob
$
38. Ïåðåøëà â êàòàëîã projec è íàñòðîèëà äëÿ Áîáà èìÿ è ïî÷òó
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/bob
$ cd projec
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/bob/projec (main)
$ git config user.name "Bob (DobrovolskaY)"
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/bob/projec (main)
$ git config user.email "DobrovolskaY@mpei.ru"
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/bob/projec (main)
$
39. Îòêðûëà êîäáëîêñ èç ïðîåêòà Áîáà è äîáàâèëà â êîä ñòðîêó ïðîèçâåäåíèÿ ÷èñåë.
Ñäåëàëà êîììèò îò Áîáà è îòïðàâèëà íà ñåðâåð.
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/bob/projec (main)
$ git add main.cpp
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/bob/projec (main)
$ git commit -m "code: äîáàâèë ñòðîêó ïðîèçâåäåíèÿ"
[main c650eec] code: äîáàâèë ñòðîêó ïðîèçâåäåíèÿ
1 file changed, 2 insertions(+), 1 deletion(-)
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/bob/projec (main)
$ git push
warning: auto-detection of host provider took too long (>2000ms)
warning: see https://aka.ms/gcm/autodetect for more information.
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), 427 bytes | 427.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 http://uit.mpei.ru/git/DobrovolskaY/cs-lab02.git
2bf7ebf..c650eec main -> main
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/bob/projec (main)
$
40. Íà ìàøèíå Àëèñû çàãðóçèëà èçìåíåíèÿ
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (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), 407 bytes | 27.00 KiB/s, done.
From http://uit.mpei.ru/git/DobrovolskaY/cs-lab02
2bf7ebf..c650eec main -> origin/main
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$
41. Ïðîñìîòðåëà èñòîðèþ âåòîê
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$ git log --oneline --decorate --all --graph
* c650eec (origin/main) code: äîáàâèë ñòðîêó ïðîèçâåäåíèÿ
* 2bf7ebf (HEAD -> main) git: óêàçàëè èãíîðèðîâàíèå ïðèñóòñòâèå äèàëîãîâ
* bb7fb2e code: äîáàâëåíà ñòðîêà âûâîäà ðàçíîñòè
* 1a3b1b1 code: äîáàâëåíà ñòðîêà êîäà
* b0b79d1 code: èçìåíåíî òåëî êîäà
* eb9a6f8 build: äîáàâëåí ôàéë ïðîåêòà
* 3df1f3a code: çàãîòîâêà ïðîãðàììû
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$
âåòêà main íèæå ÷åì âåòêà origin main (îòñòàåò)
42. Ïðîäâèíóëà âåòêó ê ñêà÷àííîé âåðñèè
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$ git pull --ff-only
Updating 2bf7ebf..c650eec
Fast-forward
main.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$
43. Îò Àëèñû äîáàâèëà ñòðîêó äåëåíèÿ â êîä è îòïðàâèëà ñîçäàííûé êîììèò íà ñåðâåð
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$ git add main.cpp
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$ git commit -m "code: äîáàâèëà ñòðîêó äåëåíèÿ"
[main c5ba5ea] code: äîáàâèëà ñòðîêó äåëåíèÿ
1 file changed, 2 insertions(+), 1 deletion(-)
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (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), 423 bytes | 423.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 http://uit.mpei.ru/git/DobrovolskaY/cs-lab02.git
c650eec..c5ba5ea main -> main
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$
44. Çàãðóçèëà èçìåíåíèÿ ó Áîáà è ïðîäâèíóëà âåòêó
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/bob/projec (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), 403 bytes | 13.00 KiB/s, done.
From http://uit.mpei.ru/git/DobrovolskaY/cs-lab02
c650eec..c5ba5ea main -> origin/main
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/bob/projec (main)
$ git pull --ff-only
Updating c650eec..c5ba5ea
Fast-forward
main.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/bob/projec (main)
$
45. Îò Àëèñû âíåñëà â êîä âûâîä ìàêñèìóìà è îòïðàâèëà ñäåëàííûé êîììèò íà ñåðâåð.
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$ git add main.cpp
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$ git commit -m "code: äîáàâèëà ìàêñèìóì"
[main 0d54153] code: äîáàâèëà ìàêñèìóì
1 file changed, 9 insertions(+), 1 deletion(-)
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (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), 470 bytes | 470.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 http://uit.mpei.ru/git/DobrovolskaY/cs-lab02.git
c5ba5ea..0d54153 main -> main
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$
46. Òî æå ñàìîå äëÿ Áîáà, òîëüêî äîáàâëåí âûâîä ìèíèìóìà. Ðåïîçèòàðèé íå ïðèíèìàåò èçìåíåíèé:
òàê êàê êîììèò Áîáà îñíîâàí íå íà ïîñëåäíåì ñóùåñòâóþùåì êîììèòå.
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/bob/projec (main)
$ git add main.cpp
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/bob/projec (main)
$ git commit -m "code: äîáàâèë âûâîä ìèíèìóìà"
[main 7f30d87] code: äîáàâèë âûâîä ìèíèìóìà
1 file changed, 8 insertions(+), 1 deletion(-)
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/bob/projec (main)
$ git push
To http://uit.mpei.ru/git/DobrovolskaY/cs-lab02.git
! [rejected] main -> main (fetch first)
error: failed to push some refs to 'http://uit.mpei.ru/git/DobrovolskaY/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-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/bob/projec (main)
$
47. Çàãðóçèëà îò Áîáà êîììèòû èç óäàëåííîãî õðàíèëèùà è îòîáðàçèëà èñòîðèþ
âñåõ âåòîê. Ãèò ïîêàçûâàåò íà ðàñõîæäåíèå âåòîê îò îáùåãî ðîäèòåëÿ
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/bob/projec (main)
$ git pull origin main
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), 450 bytes | 14.00 KiB/s, done.
From http://uit.mpei.ru/git/DobrovolskaY/cs-lab02
* branch main -> FETCH_HEAD
c5ba5ea..0d54153 main -> origin/main
Auto-merging main.cpp
CONFLICT (content): Merge conflict in main.cpp
Automatic merge failed; fix conflicts and then commit the result.
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/bob/projec (main|MERGING)
$ git log --all --oneline --graph
* 7f30d87 (HEAD -> main) code: äîáàâèë âûâîä ìèíèìóìà
| * 0d54153 (origin/main, origin/HEAD) code: äîáàâèëà ìàêñèìóì
|/
* c5ba5ea code: äîáàâèëà ñòðîêó äåëåíèÿ
* c650eec code: äîáàâèë ñòðîêó ïðîèçâåäåíèÿ
* 2bf7ebf git: óêàçàëè èãíîðèðîâàíèå ïðèñóòñòâèå äèàëîãîâ
* bb7fb2e code: äîáàâëåíà ñòðîêà âûâîäà ðàçíîñòè
* 1a3b1b1 code: äîáàâëåíà ñòðîêà êîäà
* b0b79d1 code: èçìåíåíî òåëî êîäà
* eb9a6f8 build: äîáàâëåí ôàéë ïðîåêòà
* 3df1f3a code: çàãîòîâêà ïðîãðàììû
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/bob/projec (main|MERGING)
$
48. Ñäåëàëà ïîïûòêó ïåðåìåñòèòü êîììèò Áîáà ïîâåðõ Àëèñèíîãî (origin/main)
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/bob/projec (main|MERGING)
$ git rebase origin/main
main.cpp: needs merge
error: cannot rebase: You have unstaged changes.
error: additionally, your index contains uncommitted changes.
error: Please commit or stash them.
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/bob/projec (main|MERGING)
$
Âûäàåò îøèáêó, òàê êàê ïðèñóòñòâóåò êîíôëèêò
49. Ïðîñìîòðåëà ñòàòóñ õðàíèëèùà
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/bob/projec (main|MERGING)
$ git status
On branch main
Your branch and 'origin/main' have diverged,
and have 1 and 1 different commits each, respectively.
(use "git pull" if you want to integrate the remote branch with yours)
You have unmerged paths.
(fix conflicts and run "git commit")
(use "git merge --abort" to abort the merge)
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: main.cpp
no changes added to commit (use "git add" and/or "git commit -a")
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/bob/projec (main|MERGING)
$
òåêóùàÿ âåòêà ìýéí
ëîêàëüíàÿ âåòêà è âåòêà origin/main ðàñõîäÿòñÿ è èìåþò ïî îäíîìó îòëè÷àþùåìóñÿ êîììèòó
*êàê îáúåäèíèòü óäàëåííóþ âåòêó ñ ëîêàëüíîé ñ ïîìîùüþ êîìàíäû git pull*
åñòü íåðàçðåøåííûå êîíôëèêòû
*êàê ðàçðåøèòü êîíôëèêòû è âûïîëíèòü êîììèò*
*êàê îòìåíèòü ïðîöåññ ñëèÿíèÿ âåòîê ñ ïîìîùüþ êîìàíäû git merge --abort*
åñòü íåðàçðåøåííûå êîíôëèêòû
*êàê ïîìåòèòü ôàéëû äëÿ ðàçðåøåíèÿ êîíôëèêòîâ*
óêàçûâàåò íà êîíôëèêò â ôàéëå main.cpp, êîòîðûé áûë èçìåíåí è íà ëîêàëüíîé, è íà óäàëåííîé âåòêå
ñîîáùàåò î òîì, ÷òî íè îäíî èçìåíåíèå íå áûëî äîáàâëåíî äëÿ êîììèòà
50. ôàéë äîáàâëåíâ èíäåêñ, áûëà ïîïûòêà ïðîäîëæèòü ðåáåéçèíã íî îí íå âåäåòñÿ.
âåòêè ðàñõîäÿòñÿ è èìåþò ïî îäíîìó ðàçëè÷èþ, ìû íàõîäèìñÿ â ïðîöåññå ñëèÿíèå.
èçìåíåíèÿ ãîòîâû ê êîììèòó.
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/bob/projec (main|MERGING)
$ git add main.cpp
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/bob/projec (main|MERGING)
$ git rebase --continue
fatal: No rebase in progress?
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/bob/projec (main|MERGING)
$ git status
On branch main
Your branch and 'origin/main' have diverged,
and have 1 and 1 different commits each, respectively.
(use "git pull" if you want to integrate the remote branch with yours)
All conflicts fixed but you are still merging.
(use "git commit" to conclude merge)
Changes to be committed:
modified: main.cpp
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/bob/projec (main|MERGING)
$
51. Ñîâåðøèëà êîììèò îò Áîáà, èçìåíåíèÿ îòïðàâëåíû â óäàëåííûé ðåïîçèòîðèé
íà ñåðâåð. Ãèò ñîîáùàåò, ÷òî rebase íå áûë íà÷àò èëè çàâåðøåí. Ãèò ïîêàçûâàåò
÷òî ðàáî÷åå äåðåâî ÷èñòîå, ñîîòâåòñòâåííî îïåðàöèÿ çàâåðøèëàñü óñïåøíî, ñëèÿíèå
ïðîèçîøëî è èçìåíåíèÿ îòïðàâëåíû
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/bob/projec (main|MERGING)
$ git commit -m "code: ðàçðåøåíèå êîíôëèêòà"
[main cf154d2] code: ðàçðåøåíèå êîíôëèêòà
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/bob/projec (main)
$ git push
Enumerating objects: 10, done.
Counting objects: 100% (10/10), done.
Delta compression using up to 8 threads
Compressing objects: 100% (6/6), done.
Writing objects: 100% (6/6), 880 bytes | 880.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 http://uit.mpei.ru/git/DobrovolskaY/cs-lab02.git
0d54153..cf154d2 main -> main
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/bob/projec (main)
$ git rebase --continue
fatal: No rebase in progress?
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/bob/projec (main)
$ git status
On branch main
Your branch is up to date with 'origin/main'.
nothing to commit, working tree clean
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/bob/projec (main)
$
52. Ñîçäàëà ó Àëèñû âåòêó äàáë è ïåðåêëþ÷èëàñü íà íåå
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$ git branch double
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$ git checkout double
Switched to branch 'double'
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (double)
$
53. Èçìåíèëà òèï äàííûõ è çàêîììèòèëà èçìåíåíèÿ
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (double)
$ git add main.cpp
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (double)
$ git commit -m "code: èçìåíèëà òèï"
[double d70455c] code: èçìåíèëà òèï
1 file changed, 2 insertions(+), 2 deletions(-)
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (double)
$
54. Ïåðåêëþ÷èëàñü íà âåòêó ìýéí, ïîëó÷èëà îáíîâëåíèÿ ñ óäàëåííîãî ðåïàçèòîðèÿ
(îáíîâèëà ëîêàëüíóþ âåòêó ìýéí íà ìàøèíå Àëèñû ñ ïîñëåäíåãî èçìåíåíèÿ)
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (double)
$ git checkout main
Switched to branch 'main'
Your branch is up to date with 'origin/main'.
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$ git pull origin main
remote: Enumerating objects: 10, done.
remote: Counting objects: 100% (10/10), done.
remote: Compressing objects: 100% (6/6), done.
remote: Total 6 (delta 2), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (6/6), 860 bytes | 8.00 KiB/s, done.
From http://uit.mpei.ru/git/DobrovolskaY/cs-lab02
* branch main -> FETCH_HEAD
0d54153..cf154d2 main -> origin/main
Updating 0d54153..cf154d2
Fast-forward
main.cpp | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$ git log --all --graph --decorate
* commit d70455c11d62a417fd415bc37f9817bc5efe262a (double)
| Author: Alice (DobrovolskaY) <DobrovolskaY@mpei.ru>
| Date: Wed Mar 27 00:25:26 2024 +0200
|
| code: èçìåíèëà òèï
|
| * commit cf154d2a1b859f66860e41f4e67435a9ef2e948c (HEAD -> main, origin/main)
| |\ Merge: 7f30d87 0d54153
| |/ Author: Bob (DobrovolskaY) <DobrovolskaY@mpei.ru>
|/| Date: Wed Mar 27 00:10:41 2024 +0200
| |
| | code: ðàçðåøåíèå êîíôëèêòà
| |
* | commit 0d54153db7aa47efcd66713856ddff80f18e66c8
| | Author: Alice (DobrovolskaY) <DobrovolskaY@mpei.ru>
| | Date: Tue Mar 26 23:42:23 2024 +0200
| |
| | code: äîáàâèëà ìàêñèìóì
| |
| * commit 7f30d87208d3521fe81fb420db76ff60130c6ca0
|/ Author: Bob (DobrovolskaY) <DobrovolskaY@mpei.ru>
| Date: Tue Mar 26 23:44:42 2024 +0200
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$
55. Ñëèëà âåòêè, ïåðåä ýòèì ðåøèâ êîíôëèêò è çàêîììèòèâ èçìåíåíèÿ. Ïðîâåðèëà
ñëèòû ëè âåòêè.
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$ git merge double
Auto-merging main.cpp
CONFLICT (content): Merge conflict in main.cpp
Automatic merge failed; fix conflicts and then commit the result.
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main|MERGING)
$ git add main.cpp
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main|MERGING)
$ git commit -m "code: ðåøèëà êîíôëèêò 2"
[main 255166c] code: ðåøèëà êîíôëèêò
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$ git merge double
Already up to date.
Ëèçà@DESKTOP-EF1MFMT MINGW64 ~/OneDrive/Desktop/lab2/alice/projec (main)
$
Ссылка в новой задаче View Git Blame Копировать постоянную ссылку