eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02 // мисклик $ ^[[200~mkdir alice bash: $'\E[200~mkdir': command not found eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02 //создание каталога боб $ mkdir bob eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02 //создание каталоа алиса $ mkdir alice eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02 $ mkdir bob mkdir: cannot create directory ‘bob’: File exists //уже создан eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02 $ mkdir alice mkdir: cannot create directory ‘alice’: File exists //уже создан eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02 //переход в каталог алиса $ cd alice eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice //созадние каталога проджект в каталоге алиса $ mkdir project eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice //переход в проджект $ cd project eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project //переход вверх $ cd .. eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice //переход в проджект $ cd project eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project //инициализация репозитория (хранилилища) в текущем каталоге $ git init Initialized empty Git repository in C:/Users/eeego/OneDrive/Рабочий стол/lab02/alice/project/.git/ //инициализировалось eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) $ git config user.name 'Alice (IvanovII)' eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) $ git config user.email 'alice@example.com' eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) $ ^[[200~git config user.name 'Alice (IvanovII)' bash: $'\E[200~git': command not found eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) $ git config user.email 'alice@example.com' eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) //комитты от имени алисы с личн.иниц $ git config user.name 'Alice (StarikovEV)' eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) //комиты лич.почта $ git config user.email 'StarikovYV@mpei.ru' eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) // оказывается папку не видно. команда не имеет смысла $ git init Reinitialized existing Git repository in C:/Users/eeego/OneDrive/Рабочий стол/lab02/alice/project/.git/ eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) //состояние рабочей копии $ git status On branch master //главная ветка No commits yet //не было коммитов Untracked files: //неотслеж файлы (use "git add <file>..." to include in what will be committed) bin/ main.cpp obj/ project.cbp nothing added to commit but untracked files present (use "git add" to track) //ничего не замичено, но есть не отслеж.файлы eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) // добавили в отслеживание $ git add main.cpp eeego@PK MINGW64 ~/OneDrive/Рабочий стол/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 eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) //закомичено $ git commit -m 'code :заготовка программы' [master (root-commit) 65269ac] code :заготовка программы 1 file changed, 9 insertions(+) create mode 100644 main.cpp eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) //доваили новый файл в отслеж $ git add project.cbp warning: in the working copy of 'project.cbp', LF will be replaced by CRLF the next time Git touches it eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) //закомитили $ git commit -m 'build: заготовка билда' [master 885b3a7] build: заготовка билда 1 file changed, 38 insertions(+) create mode 100644 project.cbp eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) $ git status On branch master 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 // <--есть незакомиченные изменения отличается словом modified модифицированно 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") eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) // выбираем файл $ git add main.cpp eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) //комиттим $ git commit -m "..." [master b230184] ... 1 file changed, 4 insertions(+), 2 deletions(-) eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) //добавляет в индекс измененные файлы $ git add -u eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master)// закомитили изменения $ git commit -m "..." [master 364983f] ... 1 file changed, 3 insertion(+), 2 deletion(-) eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) //способ если коммит меняет только существующие файлы $ git commit -a -m "..." On branch master Untracked files: (use "git add <file>..." to include in what will be committed) bin/ obj/ nothing added to commit but untracked files present (use "git add" to track) eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) // после гитигноре $ git status On branch master 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) eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) //добавляем гиигноре $ git add .gitignore eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) //коммитим $ git commit -m "..." [master 9008f71] ... 1 file changed, 2 insertions(+) create mode 100644 .gitignore eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) //проверяем статус $ git status On branch master nothing to commit, working tree clean eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) //работа с журналом репозитария $ git log --stat commit 9008f71f35dfdbce555dfe683d300e66d8f783a8 (HEAD -> master) //самый последний коммити Author: Alice (StarikovEV) <StarikovYV@mpei.ru> Date: Mon Mar 6 16:38:35 2023 +0300 ... .gitignore | 2 ++ //в каком файле и сколько строчек добавлено commit 9008f71f35dfdbce555dfe683d300e66d8f783a8 (HEAD -> master) //хэш Author: Alice (StarikovEV) <StarikovYV@mpei.ru> //кто сделал Date: Mon Mar 6 16:38:35 2023 +0300 //когда изменены ... .gitignore | 2 ++ 1 file changed, 2 insertions(+) commit 1b9f602bbdd6799e4b6673fc43426a729125ec5e Author: Alice (StarikovEV) <StarikovYV@mpei.ru> Date: Mon Mar 6 16:22:20 2023 +0300 ... main.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) commit 364983f08187bba0b2f920dbfdc131c0ed541dbf Author: Alice (StarikovEV) <StarikovYV@mpei.ru> Date: Mon Mar 6 16:18:44 2023 +0300 ... main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) commit b2301844841012384d1c42203f3eea2766e96260 Author: Alice (StarikovEV) <StarikovYV@mpei.ru> Date: Mon Mar 6 16:03:38 2023 +0300 ... main.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) commit 885b3a7cffae0d2ce8c603c74bcd53cf18b6dd77 Author: Alice (StarikovEV) <StarikovYV@mpei.ru> Date: Mon Mar 6 15:45:21 2023 +0300 build: заготовка билда project.cbp | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) commit 65269ac6efaf544b44f1a0fc62e292a4086113b2 eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master)//комактеоно отображение истории $ git log --oneline --decorate 9008f71 (HEAD -> master) ... 1b9f602 ... 364983f ... b230184 ... 885b3a7 build: заготовка билда 65269ac code :заготовка программы eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) // то же самое только для всех веток $ git log --oneline --decorate --all --graph * 9008f71 (HEAD -> master) ... * 1b9f602 ... * 364983f ... * b230184 ... * 885b3a7 build: заготовка билда * 65269ac code :заготовка программы eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) // прописан .gitignore $ git status On branch master nothing to commit, working tree clean eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) //добавлен лайаут в гитигноре $ git status On branch master Changes not staged for commit: (use "git add <file>..." to update what will be committed) (use "git restore <file>..." to discard changes in working directory) modified: .gitignore no changes added to commit (use "git add" and/or "git commit -a") eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (maste // коммит по признаку $ git log --grep "build" commit 885b3a7cffae0d2ce8c603c74bcd53cf18b6dd77 Author: Alice (StarikovEV) <StarikovYV@mpei.ru> Date: Mon Mar 6 15:45:21 2023 +0300 build: заготовка билда eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (maste // коммит по файлу $ git log -- main.cpp commit 1b9f602bbdd6799e4b6673fc43426a729125ec5e Author: Alice (StarikovEV) <StarikovYV@mpei.ru> Date: Mon Mar 6 16:22:20 2023 +0300 ... commit 364983f08187bba0b2f920dbfdc131c0ed541dbf Author: Alice (StarikovEV) <StarikovYV@mpei.ru> Date: Mon Mar 6 16:18:44 2023 +0300 ... commit b2301844841012384d1c42203f3eea2766e96260 Author: Alice (StarikovEV) <StarikovYV@mpei.ru> Date: Mon Mar 6 16:03:38 2023 +0300 ... commit 65269ac6efaf544b44f1a0fc62e292a4086113b2 Author: Alice (StarikovEV) <StarikovYV@mpei.ru> Date: Mon Mar 6 15:29:11 2023 +0300 code :заготовка программы $ git show HEAD // Содержимое отдельных коммитов просматривается командой git show <refspec>, где <refspec> может быть хэшем коммита, именем ветви или выражением, которое задает, на сколько от них отступить в истории. commit 9008f71f35dfdbce555dfe683d300e66d8f783a8 (HEAD -> master) Author: Alice (StarikovEV) <StarikovYV@mpei.ru> Date: Mon Mar 6 16:38:35 2023 +0300 ... diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4c7473d --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/bin +/obj $ git show master // эквивалентный способ commit 9008f71f35dfdbce555dfe683d300e66d8f783a8 (HEAD -> master) Author: Alice (StarikovEV) <StarikovYV@mpei.ru> Date: Mon Mar 6 16:38:35 2023 +0300 ... diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4c7473d --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/bin +/obj $ git show HEAD~1 // предпоследний коммит commit 1b9f602bbdd6799e4b6673fc43426a729125ec5e Author: Alice (StarikovEV) <StarikovYV@mpei.ru> Date: Mon Mar 6 16:22:20 2023 +0300 ... diff --git a/main.cpp b/main.cpp index 5750119..0442e06 100644 --- a/main.cpp +++ b/main.cpp @@ -6,6 +6,7 @@ int main() { cout << "Enter A and B: "; int a, b; - cin >> a >> b; - cout<< " Sum: "<<a+b; + cout << "A + B = " << a + b << '\n' + << "A - B = " << a - b << '\n'; + } $ git diff // показывает изменения коммита diff --git a/.gitignore b/.gitignore index 4c7473d..d85abef 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /bin /obj +/*.layout diff --git a/main.cpp b/main.cpp index 0442e06..3e4d645 100644 --- a/main.cpp +++ b/main.cpp @@ -7,6 +7,7 @@ int main() cout << "Enter A and B: "; int a, b; cout << "A + B = " << a + b << '\n' - << "A - B = " << a - b << '\n'; + << "A - B = " << a - b << '\n' + << "A * B = " << a * b << '\n'; } $ git diff HEAD~2 два почследних изменения diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d85abef --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +/bin +/obj +/*.layout diff --git a/main.cpp b/main.cpp index 5750119..3e4d645 100644 --- a/main.cpp +++ b/main.cpp @@ -6,6 +6,8 @@ int main() { cout << "Enter A and B: "; int a, b; - cin >> a >> b; - cout<< " Sum: "<<a+b; + cout << "A + B = " << a + b << '\n' + << "A - B = " << a - b << '\n' + << "A * B = " << a * b << '\n'; + } $ git diff HEAD~2 HEAD // добавление разностип diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4c7473d --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/bin +/obj diff --git a/main.cpp b/main.cpp index 5750119..0442e06 100644 --- a/main.cpp +++ b/main.cpp @@ -6,6 +6,7 @@ int main() { cout << "Enter A and B: "; int a, b; - cin >> a >> b; - cout<< " Sum: "<<a+b; + cout << "A + B = " << a + b << '\n' + << "A - B = " << a - b << '\n'; + } eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) $ git add main.cpp fatal: Unable to create 'C:/Users/eeego/OneDrive/Рабочий стол/lab02/alice/project/.git/index.lock': File exists. Another git process seems to be running in this repository, e.g. an editor opened by 'git commit'. Please make sure all processes are terminated then try again. If it still fails, a git process may have crashed in this repository earlier: remove the file manually to continue. eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) $ rm .git/index.lock eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) $ git add main.cpp eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) // закомичено произведение $ git commit -m 'code: произведение' [master 140f502] code: произведение 1 file changed, 2 insertions(+), 1 deletion(-) eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) //откатили версию $ git reset --hard HEAD~1 HEAD is now at 9008f71 ... eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) $ git status On branch master 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 no changes added to commit (use "git add" and/or "git commit -a") eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) //восстановление файла до известного момента $ git checkout HEAD -- main.cpp eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) // создаем ключи для связи с сервером $ ssh-keygen Generating public/private rsa key pair. Enter file in which to save the key (/c/Users/eeego/.ssh/id_rsa): Created directory '/c/Users/eeego/.ssh'. Enter passphrase (empty for no passphrase): Enter same passphrase again: Your identification has been saved in /c/Users/eeego/.ssh/id_rsa Your public key has been saved in /c/Users/eeego/.ssh/id_rsa.pub The key fingerprint is: SHA256:bCIBXjGI4q9EcNIYU8dpNbm+JF3GX7eHjQvellakxBI eeego@PK The key's randomart image is: +---[RSA 3072]----+ |o*oo=+o. | |*o+++... E | |+o... o o | | o ...+ o + .| |. . .o.oS. . + B | | . ...+o . . = +| |. . o . . o = | | . . . * | | o | +----[SHA256]-----+ eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) //запускаем агент чтобы он ключи сам давал $ eval $(ssh-agent -s) Agent pid 1406 eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) //ключ и пароль $ ssh-add Enter passphrase for /c/Users/eeego/.ssh/id_rsa: Identity added: /c/Users/eeego/.ssh/id_rsa (eeego@PK) eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) //отображение открытого ключа $ cat ~/.ssh/id_rsa.pub ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC49DXJH79NVsX0OyoP3KiwgfgC5AIgV8nVuqRcd/GPKZHHYxRcjzFYfz3zQnatzgGh5GX7KW/t2qxmA0LFI6nSXDwbeKXK+50sjLnnKUP2Gw9/3XSyoRHhJU6XFmBOCqnVe2t72PId+cslB0Ta205rZgWMPVBAxpTle+ckfg9WADHVWNqDkzvuNcisyWhPg32v4zzMnfp820XxKrs2rRUkeMMPTova/2ahRj4Oqejyr8Pn6vlgZ2+g4eF5y7lxMU7fe7GPrCY7P/zUvDFHsTlMS/fUVHbOjgHI2QTfCesUqY7v89UOoxCGUMtL8xya+0pn5n1vfj+t2cd8cavHlDlR7aiiG+V7kCnecg6iHglz58FBW5mkelbOdcaRviL5NDzaaagJcv/Sjn/5k3tU3bfpn9G9rMiirUiZw7Z08/FNOLHLz9BKpPpU8cAabMyYdXIIjRDKb2/rNFxSpw+ZONfr1kIfZYWfshloOi95U/lU7M8UkKANbiv4gcsFzrQ93bM= eeego@PK $ git push --set-upstream origin master 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])? Host key verification failed. fatal: Could not read from remote repository. Please make sure you have the correct access rights and the repository exists. $ git push --set-upstream origin master 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. Enter passphrase for key '/c/Users/eeego/.ssh/id_rsa': 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.16 KiB | 276.00 KiB/s, done. Total 18 (delta 2), reused 0 (delta 0), pack-reused 0 remote: . Processing 1 references remote: Processed 1 references in total To uit.mpei.ru:StarikovYV/cs-lab02.git * [new branch] master -> master branch 'master' set up to track 'origin/master'. eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project_bob (master) //идентификация для боба $ git config user.name 'Bob (InanovII)' eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project_bob (master) $ git config user.email 'eeegor-s@yandex.ru' eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project_bob (master)// делаем произвеение от имени боба и коммитим $ git status On branch master Your branch is up to date with 'origin/master'. 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 no changes added to commit (use "git add" and/or "git commit -a") eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project_bob (master) $ git add main.cpp eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project_bob (master) $ git commit -m'code: умножение от боба' [master a2529ef] code: умножение от боба 1 file changed, 2 insertions(+), 1 deletion(-) eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project_bob (master)//отправили на сервер $ git push Enter passphrase for key '/c/Users/eeego/.ssh/id_rsa': 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), 413 bytes | 413.00 KiB/s, done. Total 3 (delta 1), reused 0 (delta 0), pack-reused 0 remote: . Processing 1 references remote: Processed 1 references in total To uit.mpei.ru:StarikovYV/cs-lab02.git 9008f71..a2529ef master -> master eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) // загрузка изменений с машины алисы $ git fetch Enter passphrase for key '/c/Users/eeego/.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 1), reused 0 (delta 0), pack-reused 0 Unpacking objects: 100% (3/3), 393 bytes | 131.00 KiB/s, done. From uit.mpei.ru:StarikovYV/cs-lab02 9008f71..a2529ef master -> origin/master eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master)/просмотрели историю всез веток $ git log --oneline --decorate --all --graph * a2529ef (origin/master) code: умножение от боба * 9008f71 (HEAD -> master) ... * 1b9f602 ... * 364983f ... * b230184 ... * 885b3a7 build: заготовка билда * 65269ac code :заготовка программы eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) //продвинули ветку мэйн $ git pull --ff-only Enter passphrase for key '/c/Users/eeego/.ssh/id_rsa': Updating 9008f71..a2529ef Fast-forward main.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master)/проверили, все нормально, мэйн обновился $ git log --oneline --decorate --all --graph * a2529ef (HEAD -> master, origin/master) code: умножение от боба * 9008f71 ... * 1b9f602 ... * 364983f ... * b230184 ... * 885b3a7 build: заготовка билда * 65269ac code :заготовка программы eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) //делаем деление алисой, комитим и загружаем на сервер $ git status On branch master Your branch is up to date with 'origin/master'. 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 no changes added to commit (use "git add" and/or "git commit -a") eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) $ git add main.cpp eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) $ git commit -m 'code: деление алиса' [master 808dd59] code: деление алиса 1 file changed, 2 insertions(+), 1 deletion(-) eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) $ get fetch bash: get: command not found eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) $ get fech bash: get: command not found eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) $ git fetch Enter passphrase for key '/c/Users/eeego/.ssh/id_rsa': eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) $ git push Enter passphrase for key '/c/Users/eeego/.ssh/id_rsa': 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), 406 bytes | 406.00 KiB/s, done. Total 3 (delta 1), reused 0 (delta 0), pack-reused 0 remote: . Processing 1 references remote: Processed 1 references in total To uit.mpei.ru:StarikovYV/cs-lab02.git a2529ef..808dd59 master -> master eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project_bob (master) //загружаем с сервера изменения алисы $ git log --oneline --decorate --all --graph * a2529ef (HEAD -> master, origin/master, origin/HEAD) code: умножение от боба * 9008f71 ... * 1b9f602 ... * 364983f ... * b230184 ... * 885b3a7 build: заготовка билда * 65269ac code :заготовка программы eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project_bob (master) $ git pull --ff-only Enter passphrase for key '/c/Users/eeego/.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 1), reused 0 (delta 0), pack-reused 0 Unpacking objects: 100% (3/3), 386 bytes | 29.00 KiB/s, done. From uit.mpei.ru:StarikovYV/cs-lab02 a2529ef..808dd59 master -> origin/master Updating a2529ef..808dd59 Fast-forward main.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project_bob (master) $ git log --oneline --decorate --all --graph * 808dd59 (HEAD -> master, origin/master, origin/HEAD) code: деление алиса * a2529ef code: умножение от боба * 9008f71 ... * 1b9f602 ... * 364983f ... * b230184 ... * 885b3a7 build: заготовка билда * 65269ac code :заготовка программы eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) //делаем изменение у алисы комиттим и отправляем на сервер $ git add main.cpp eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) $ git commit -m 'code: алиса' [master ac2d1f2] code: алиса 1 file changed, 4 insertions(+) eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) $ git push Enter passphrase for key '/c/Users/eeego/.ssh/id_rsa': 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), 394 bytes | 394.00 KiB/s, done. Total 3 (delta 1), reused 0 (delta 0), pack-reused 0 remote: . Processing 1 references remote: Processed 1 references in total To uit.mpei.ru:StarikovYV/cs-lab02.git 808dd59..ac2d1f2 master -> master eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project_bob (master) // делаем изменения с бобом, комитим и отправляем $ git add main.cpp eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project_bob (master) $ git commit -m 'code: боб сделал' [master c59fc1e] code: боб сделал 1 file changed, 4 insertions(+), 1 deletion(-) eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project_bob (master)// не отправляет, т.к конфликт версий $ git push Enter passphrase for key '/c/Users/eeego/.ssh/id_rsa': To uit.mpei.ru:StarikovYV/cs-lab02.git ! [rejected] master -> master (fetch first) error: failed to push some refs to 'uit.mpei.ru:StarikovYV/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. eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project_bob (master)//загружаем с удаленного сервера $ git pull --ff-only Enter passphrase for key '/c/Users/eeego/.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 1), reused 0 (delta 0), pack-reused 0 Unpacking objects: 100% (3/3), 374 bytes | 28.00 KiB/s, done. From uit.mpei.ru:StarikovYV/cs-lab02 808dd59..ac2d1f2 master -> origin/master fatal: Not possible to fast-forward, aborting. eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project_bob (master) // РЕЗУЛЬТАТ $ git log --oneline --decorate --all --graph * c59fc1e (HEAD -> master) code: боб сделал | * ac2d1f2 (origin/master, origin/HEAD) code: алиса |/ * 808dd59 code: деление алиса * a2529ef code: умножение от боба * 9008f71 ... * 1b9f602 ... * 364983f ... * b230184 ... * 885b3a7 build: заготовка билда * 65269ac code :заготовка программы eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project_bob (master)//перемещаем коммит боба поверх коммита алисы и получаем ошибку $ git rebase origin/main fatal: invalid upstream 'origin/main' eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project_bob (master) // в отчете видим, чо коммит боба переместилось выше коммита алисы $ git log --oneline --decorate --all --graph * c59fc1e (HEAD -> master) code: боб сделал | * ac2d1f2 (origin/master, origin/HEAD) code: алиса |/ * 808dd59 code: деление алиса * a2529ef code: умножение от боба * 9008f71 ... * 1b9f602 ... * 364983f ... * b230184 ... * 885b3a7 build: заготовка билда * 65269ac code :заготовка программы //в прогрмаме боба пявились конфликтные изменения. Начинаем редактировать eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project_bob (master|REBASE 1/1) $ git add main.cpp eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project_bob (master|REBASE 1/1) // заменили $ git rebase --continue Successfully rebased and updated refs/heads/master. eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/bob/project_bob (master) //без фатальных ошибок $ git log --oneline --decorate --all --graph * 3486ce1 (HEAD -> master) code: боб сделал * ac2d1f2 (origin/master, origin/HEAD) code: алиса * 808dd59 code: деление алиса * a2529ef code: умножение от боба * 9008f71 ... * 1b9f602 ... * 364983f ... * b230184 ... * 885b3a7 build: заготовка билда * 65269ac code :заготовка программы eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) // создали ветку $ git branch double eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) // переключились на втеку дабл $ git checkout double Switched to branch 'double' eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (double) $ git add main.cpp eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (double) //закомитили $ git commit -m'code: в новой ветке' [double 63d8114] code: в новой ветке 1 file changed, 1 insertion(+), 1 deletion(-) eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (double)//переключились на ветку мастер $ git checkout master Switched to branch 'master' Your branch is up to date with 'origin/master'. eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master)//залили майн алисы на сервер $ git pull Enter passphrase for key '/c/Users/eeego/.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 1), reused 0 (delta 0), pack-reused 0 Unpacking objects: 100% (3/3), 397 bytes | 33.00 KiB/s, done. From uit.mpei.ru:StarikovYV/cs-lab02 ac2d1f2..3486ce1 master -> origin/master Updating ac2d1f2..3486ce1 Fast-forward main.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master|MERGING) $ git merge --continue [master 05c60ee] Merge branch 'double' eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master)//история веток $ git log --oneline --decorate --all --graph * 05c60ee (HEAD -> master) Merge branch 'double' |\ | * 63d8114 (double) code: в новой ветке * | 3486ce1 (origin/master) code: боб сделал |/ * ac2d1f2 code: алиса * 808dd59 code: деление алиса * a2529ef code: умножение от боба * 9008f71 ... * 1b9f602 ... * 364983f ... * b230184 ... * 885b3a7 build: заготовка билда * 65269ac code :заготовка программы eeego@PK MINGW64 ~/OneDrive/Рабочий стол/lab02/alice/project (master) $ git log commit 05c60ee856c740741e1edfdb292125af1eb64c64 (HEAD -> master) Merge: 3486ce1 63d8114 Author: Alice (StarikovEV) <StarikovYV@mpei.ru> Date: Mon Mar 20 16:02:05 2023 +0300 Merge branch 'double' commit 63d8114c60dbfbe6e508d47e8df679b90946d5e9 (double) Author: Alice (StarikovEV) <StarikovYV@mpei.ru> Date: Mon Mar 20 15:53:14 2023 +0300 code: в новой ветке commit 3486ce1d6f0a9e6a1668a2feba79b94220cb7d2f (origin/master) Author: Bob (InanovII) <eeegor-s@yandex.ru> Date: Mon Mar 20 15:10:12 2023 +0300 code: боб сделал commit ac2d1f2b64e99f093c02dba08d50dc5f9a7a7d23 Author: Alice (StarikovEV) <StarikovYV@mpei.ru> Date: Mon Mar 20 15:08:03 2023 +0300