User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02 $ mkdir alice User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02 $ mkdir bob User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02 $ cd alice User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/alice $ mkdir project User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/alice $ cd project User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/alice/project $ cd .. User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/alice $ cd project User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/alice/project $ git init Initialized empty Git repository in C:/Users/User/Desktop/lab02/alice/project/.git/ User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/alice/project (master) $ git config user.name 'Alice (TabolinIA)' User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/alice/project (master) $ git config user.email 'TabolinIA@mpei.ru' User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/alice/project (master) $ git status On branch master No commits yet Untracked files: (use "git add ..." 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) User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/alice/project (master) $ git add main.cpp User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/alice/project (master) $ git status On branch master No commits yet Changes to be committed: (use "git rm --cached ..." to unstage) new file: main.cpp Untracked files: (use "git add ..." to include in what will be committed) bin/ obj/ project.cbp User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/alice/project (master) $ git commit -m 'code: заготовка программы' [master (root-commit) 754a479] code: заготовка программы 1 file changed, 9 insertions(+) create mode 100644 main.cpp User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/alice/project (master) $ git branch -m main User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/alice/project (main) $ git status On branch main Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git restore ..." to discard changes in working directory) modified: main.cpp Untracked files: (use "git add ..." to include in what will be committed) bin/ obj/ project.cbp no changes added to commit (use "git add" and/or "git commit -a") User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/alice/project (main) $ git add main.cpp User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/alice/project (main) $ git commit -m "code: ввод значений" [main a4150a3] code: ввод значений 1 file changed, 3 insertions(+), 2 deletions(-) User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/alice/project (main) $ git add -u User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/alice/project (main) $ git commit -m "code: вывод суммы" [main 184c338] code: вывод суммы 1 file changed, 1 insertion(+) User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/alice/project (main) $ git commit -a -m "code: вывод разности" [main 8a32278] code: вывод разности 1 file changed, 2 insertions(+), 1 deletion(-) User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/alice/project (main) $ git status On branch main Untracked files: (use "git add ..." to include in what will be committed) .gitignore obj/ project.depend nothing added to commit but untracked files present (use "git add" to track) User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/alice/project (main) $ git status On branch main Untracked files: (use "git add ..." to include in what will be committed) .gitignore nothing added to commit but untracked files present (use "git add" to track) User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/alice/project (main) $ git add .gitignore User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/alice/project (main) $ git commit -m "git: игнорирование файлов" [main cea7de7] git: игнорирование файлов 1 file changed, 3 insertions(+) create mode 100644 .gitignore User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/alice/project (main) $ git log --stat commit cea7de70078d3c12ffec394c58288469bed0277b (HEAD -> main) Author: Alice (TabolinIA) Date: Wed Mar 27 14:50:57 2024 +0300 git: игнорирование файлов .gitignore | 3 +++ 1 file changed, 3 insertions(+) commit 8a32278b62125e96436e7678c0e72a3a46602c94 Author: Alice (TabolinIA) Date: Wed Mar 27 14:47:15 2024 +0300 code: вывод разности main.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit 184c338e12b2068092f4a2b819a4b117dc3c0289 Author: Alice (TabolinIA) Date: Wed Mar 27 14:45:41 2024 +0300 code: вывод суммы User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/alice/project (main) $ git log --oneline --decorate cea7de7 (HEAD -> main) git: игнорирование файлов 8a32278 code: вывод разности 184c338 code: вывод суммы a4150a3 code: ввод значений d540eeb build: добавлен файл проекта 754a479 code: заготовка программы User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/alice/project (main) $ git log --oneline --decorate --all --graph * cea7de7 (HEAD -> main) git: игнорирование файлов * 8a32278 code: вывод разности * 184c338 code: вывод суммы * a4150a3 code: ввод значений * d540eeb build: добавлен файл проекта * 754a479 code: заготовка программы User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/alice/project (main) $ git log --grep "build:" commit d540eebc976ceb148a98554febb80dbec098a8b2 Author: Alice (TabolinIA) Date: Wed Mar 27 14:27:52 2024 +0300 build: добавлен файл проекта User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/alice/project (main) $ git log -- project.cbp commit d540eebc976ceb148a98554febb80dbec098a8b2 Author: Alice (TabolinIA) Date: Wed Mar 27 14:27:52 2024 +0300 build: добавлен файл проекта User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/alice/project (main) $ git show HEAD commit cea7de70078d3c12ffec394c58288469bed0277b (HEAD -> main) Author: Alice (TabolinIA) Date: Wed Mar 27 14:50:57 2024 +0300 git: игнорирование файлов diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..aecc882 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +/bin +/obj +/project.depend User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/alice/project (main) $ git show main commit cea7de70078d3c12ffec394c58288469bed0277b (HEAD -> main) Author: Alice (TabolinIA) Date: Wed Mar 27 14:50:57 2024 +0300 git: игнорирование файлов diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..aecc882 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +/bin +/obj +/project.depend User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/alice/project (main) $ git show cea7de7 commit cea7de70078d3c12ffec394c58288469bed0277b (HEAD -> main) Author: Alice (TabolinIA) Date: Wed Mar 27 14:50:57 2024 +0300 git: игнорирование файлов diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..aecc882 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +/bin +/obj +/project.depend // просмотр предпоследнего коммита тремя способами v // первый способ User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/alice/project (main) $ git show HEAD~1 commit 8a32278b62125e96436e7678c0e72a3a46602c94 Author: Alice (TabolinIA) Date: Wed Mar 27 14:47:15 2024 +0300 code: вывод разности diff --git a/main.cpp b/main.cpp index 73cd347..35d8866 100644 --- a/main.cpp +++ b/main.cpp @@ -7,5 +7,6 @@ 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'; } // второй способ User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/alice/project (main) $ git show 8a32278 commit 8a32278b62125e96436e7678c0e72a3a46602c94 Author: Alice (TabolinIA) Date: Wed Mar 27 14:47:15 2024 +0300 code: вывод разности diff --git a/main.cpp b/main.cpp index 73cd347..35d8866 100644 --- a/main.cpp +++ b/main.cpp @@ -7,5 +7,6 @@ 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'; } // третий способ User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/alice/project (main) $ git show cea7de7~1 commit 8a32278b62125e96436e7678c0e72a3a46602c94 Author: Alice (TabolinIA) Date: Wed Mar 27 14:47:15 2024 +0300 code: вывод разности diff --git a/main.cpp b/main.cpp index 73cd347..35d8866 100644 --- a/main.cpp +++ b/main.cpp @@ -7,5 +7,6 @@ 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'; } // просмотр предпоследнего коммита тремя способами ^ // просмотр изменений v User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/alice/project (main) $ git diff warning: in the working copy of 'project.cbp', LF will be replaced by CRLF the next time Git touches it diff --git a/main.cpp b/main.cpp index 35d8866..e8ca1b6 100644 --- a/main.cpp +++ b/main.cpp @@ -8,5 +8,6 @@ int main() int a, b; cin >> a >> b; cout << "A + B = " << a + b << '/n' - << "A - B = " << a - b << '/n'; // теперь вывод заканчивается не на выводе разности, + << "A - B = " << a - b << '/n' // а на выводе произведения + << "A * B = " << a * b << '/n'; } diff --git a/project.cbp b/project.cbp index 99bb702..34f06bc 100644 --- a/project.cbp +++ b/project.cbp @@ -32,6 +32,7 @@ + // просмотр изменений ^ // просмотр изменений между первым коммитом и коммитом, добавляющим вывод разности v User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/alice/project (main) $ git diff 754a479 8a32278 diff --git a/main.cpp b/main.cpp index b4392ec..35d8866 100644 --- a/main.cpp +++ b/main.cpp @@ -4,6 +4,9 @@ using namespace std; int main() { - cout << "Hello world!" << endl; - return 0; + cout << "Enter A and B: "; + int a, b; + cin >> a >> b; + cout << "A + B = " << a + b << '/n' + << "A - B = " << a - b << '/n'; } diff --git a/project.cbp b/project.cbp new file mode 100644 index 0000000..99bb702 --- /dev/null +++ b/project.cbp @@ -0,0 +1,40 @@ + // просмотр изменений между первым коммитом и коммитом, добавляющим вывод разности ^ // откат изменений в рабочей копии до последнего коммита User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/alice/project (main) $ git reset --hard HEAD~1 HEAD is now at cea7de7 git: игнорирование файлов User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/alice/project (main) $ git checkout HEAD -- main.cpp // откат изменений в рабочей копии до последнего коммита // создание ключей v User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/alice/project (main) $ ssh-keygen Generating public/private ed25519 key pair. Enter file in which to save the key (/c/Users/User/.ssh/id_ed25519): /c/Users/User/.ssh/id_ed25519 already exists. Overwrite (y/n)? y Enter passphrase (empty for no passphrase): Enter same passphrase again: Your identification has been saved in /c/Users/User/.ssh/id_ed25519 Your public key has been saved in /c/Users/User/.ssh/id_ed25519.pub The key fingerprint is: SHA256:Dh9sHUNQY+xqqQUoiXJVp2TSXIyGYwYhmOOGUvic5nU User@DESKTOP-3STHCSC The key's randomart image is: +--[ED25519 256]--+ |oooo.=++++= | |=.. *+=o.o.. | |o* * +. .o | |=oO o E. ..o | |++ o ...So. | | . ==. | | +o | | . | | | +----[SHA256]-----+ // создание ключей ^ User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/alice/project (main) $ eval $(ssh-agent -s) Agent pid 1680 User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/alice/project (main) $ ssh-add Enter passphrase for /c/Users/User/.ssh/id_ed25519: Identity added: /c/Users/User/.ssh/id_ed25519 (User@DESKTOP-3STHCSC) User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/alice/project (main) $ cat ~/.ssh/id_ed25519.pub ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIHHKfoNqBYEAyZoljB+anbK9JSkGkcp8GJw4cpi+oVQ User@DESKTOP-3STHCSC // push репозитория на сервер User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/alice/project (main) $ git remote add origin http://uit.mpei.ru/git/TabolinIA/cs-lab02.git User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/alice/project (main) $ git push -u origin main Enumerating objects: 18, done. Counting objects: 100% (18/18), done. Delta compression using up to 8 threads Compressing objects: 100% (16/16), done. Writing objects: 100% (18/18), 2.28 KiB | 334.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/TabolinIA/cs-lab02.git * [new branch] main -> main branch 'main' set up to track 'origin/main'. // push репозитория на сервер // клонирование проекта в каталог Боба (bash Bob'а) v User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/bob $ git clone http://uit.mpei.ru/git/TabolinIA/cs-lab02.git project Cloning into 'project'... 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), 2.28 KiB | 167.00 KiB/s, done. Resolving deltas: 100% (2/2), done. // клонирование проекта в каталог Боба (bash Bob'а) v // настройка Git'а Боба v User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/bob/project (main) $ git config user.name 'Bob (TabolinIA)' User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/bob/project (main) $ git config user.email 'TabolinIA@mpei.ru' // настройка Git'а Боба ^ // push коммита Боба с выводом произведения v User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/bob/project (main) $ git add main.cpp User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/bob/project (main) $ git commit -m 'code: вывод произведения' [main 57dec90] code: вывод произведения 1 file changed, 2 insertions(+), 1 deletion(-) User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/bob/project (main) $ git log commit 57dec90b28f894541c34a121b78993469647ef8e (HEAD -> main) Author: Bob (TabolinIA) Date: Wed Apr 10 10:15:02 2024 +0300 code: вывод произведения commit cea7de70078d3c12ffec394c58288469bed0277b (origin/main, origin/HEAD) Author: Alice (TabolinIA) Date: Wed Mar 27 14:50:57 2024 +0300 git: игнорирование файлов commit 8a32278b62125e96436e7678c0e72a3a46602c94 Author: Alice (TabolinIA) Date: Wed Mar 27 14:47:15 2024 +0300 code: вывод разности commit 184c338e12b2068092f4a2b819a4b117dc3c0289 Author: Alice (TabolinIA) Date: Wed Mar 27 14:45:41 2024 +0300 code: вывод суммы User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/bob/project (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), 413 bytes | 413.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/TabolinIA/cs-lab02.git cea7de7..57dec90 main -> main // push коммита Боба с выводом произведения ^ // загрузка изменений с машины Алисы v User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/alice/project (main) $ git fetch remote: Enumerating objects: 5, done. remote: Counting objects: 100% (5/5), done. remote: Compressing objects: 100% (3/3), done. remote: Total 3 (delta 1), reused 0 (delta 0), pack-reused 0 Unpacking objects: 100% (3/3), 393 bytes | 35.00 KiB/s, done. From http://uit.mpei.ru/git/TabolinIA/cs-lab02 cea7de7..57dec90 main -> origin/main User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/alice/project (main) $ git log --oneline --decorate --all --graph * 57dec90 (origin/main) code: вывод произведения * cea7de7 (HEAD -> main) git: игнорирование файлов * 8a32278 code: вывод разности * 184c338 code: вывод суммы * a4150a3 code: ввод значений * d540eeb build: добавлен файл проекта * 754a479 code: заготовка программы User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/alice/project (main) $ git pull --ff-only Updating cea7de7..57dec90 Fast-forward main.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) // загрузка изменений с машины Алисы ^ // создание коммита с выводом частного (машина Алисы) v User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/alice/project (main) $ git commit -a -m 'code: вывод частного' [main 230cc6a] code: вывод частного 1 file changed, 2 insertions(+), 1 deletion(-) User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/alice/project (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), 410 bytes | 410.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/TabolinIA/cs-lab02.git 57dec90..230cc6a main -> main // создание коммита с выводом частного (машина Алисы) ^ // загрузка коммита с выводом частного (машина Боба) v User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/bob/project (main) $ git pull --ff-only 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), 390 bytes | 17.00 KiB/s, done. From http://uit.mpei.ru/git/TabolinIA/cs-lab02 57dec90..230cc6a main -> origin/main Updating 57dec90..230cc6a Fast-forward main.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) // загрузка коммита с выводом частного (машина Боба) ^ // push коммита Алисы с выводом максимума V User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/alice/project (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), 447 bytes | 447.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/TabolinIA/cs-lab02.git 230cc6a..336da54 main -> main // push коммита Алисы с выводом максимума ^ // попытка запушить коммит Боба с выводом минимума V User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/bob/project (main) $ git add main.cpp User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/bob/project (main) $ git commit -m 'code: вывод минимума' [main 6bc83aa] code: вывод минимума 1 file changed, 6 insertions(+), 1 deletion(-) User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/bob/project (main) $ git push To http://uit.mpei.ru/git/TabolinIA/cs-lab02.git ! [rejected] main -> main (fetch first) error: failed to push some refs to 'http://uit.mpei.ru/git/TabolinIA/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. // попытка запушить коммит Боба с выводом минимума ^ // расхождение ветки main локального репозитария с веткой main на сервере V User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/bob/project (main) $ git pull remote: Enumerating objects: 5, done. remote: Counting objects: 100% (5/5), done. remote: Compressing objects: 100% (3/3), done. remote: Total 3 (delta 1), reused 0 (delta 0), pack-reused 0 Unpacking objects: 100% (3/3), 427 bytes | 14.00 KiB/s, done. From http://uit.mpei.ru/git/TabolinIA/cs-lab02 230cc6a..336da54 main -> origin/main Auto-merging main.cpp CONFLICT (content): Merge conflict in main.cpp Automatic merge failed; fix conflicts and then commit the result. User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/bob/project (main|MERGING) $ git log --oneline --decorate --all --graph * 6bc83aa (HEAD -> main) code: вывод минимума | * 336da54 (origin/main, origin/HEAD) code: вывод максимума |/ * 230cc6a code: вывод частного * 57dec90 code: вывод произведения * cea7de7 git: игнорирование файлов * 8a32278 code: вывод разности * 184c338 code: вывод суммы * a4150a3 code: ввод значений * d540eeb build: добавлен файл проекта * 754a479 code: заготовка программы // расхождение ветки main локального репозитария с веткой main на сервере ^ // попытка слить ветки V User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/bob/project (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. User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/bob/project (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 ..." to mark resolution) both modified: main.cpp Untracked files: (use "git add ..." to include in what will be committed) project.layout no changes added to commit (use "git add" and/or "git commit -a") // попытка слить ветки ^ // успешное слияние веток V User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/bob/project (main|REBASE 1/1) $ git add main.cpp User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/bob/project (main|REBASE 1/1) $ git rebase --continue [detached HEAD ef302f8] code: вывод минимума 1 file changed, 10 insertions(+) Successfully rebased and updated refs/heads/main. Z User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/bob/project (main) $ git commit -a -m 'code: разрешение конфликта' [main c2b260d] code: разрешение конфликта 1 file changed, 3 insertions(+), 8 deletions(-) User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/bob/project (main) $ git push Enumerating objects: 8, done. Counting objects: 100% (8/8), done. Delta compression using up to 8 threads Compressing objects: 100% (6/6), done. Writing objects: 100% (6/6), 898 bytes | 299.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/TabolinIA/cs-lab02.git 336da54..c2b260d main -> main // успешное слияние веток ^ // изменение типа данных с машины Алисы V User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/alice/project (main) $ git branch double User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/alice/project (main) $ git checkout double Switched to branch 'double' User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/alice/project (double) $ git commit -a -m 'code: замена типа данных' [double ac0f238] code: замена типа данных 1 file changed, 2 insertions(+), 2 deletions(-) User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/alice/project (double) $ git checkout main Switched to branch 'main' Your branch is up to date with 'origin/main'. User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/alice/project (main) $ git pull remote: Enumerating objects: 8, done. remote: Counting objects: 100% (8/8), 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), 878 bytes | 18.00 KiB/s, done. From http://uit.mpei.ru/git/TabolinIA/cs-lab02 336da54..c2b260d main -> origin/main Updating 336da54..c2b260d Fast-forward main.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/alice/project (main) $ git merge double Auto-merging main.cpp Merge made by the 'ort' strategy. main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/alice/project (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), 734 bytes | 734.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/TabolinIA/cs-lab02.git c2b260d..7644d88 main -> main User@DESKTOP-3STHCSC MINGW64 ~/Desktop/lab02/alice/project (main) $ git log --oneline --decorate --all --graph * 7644d88 (HEAD -> main, origin/main) Merge branch 'double' |\ | * ac0f238 (double) code: замена типа данных * | c2b260d code: разрешение конфликта * | ef302f8 code: вывод минимума |/ * 336da54 code: вывод максимума * 230cc6a code: вывод частного * 57dec90 code: вывод произведения * cea7de7 git: игнорирование файлов * 8a32278 code: вывод разности * 184c338 code: вывод суммы * a4150a3 code: ввод значений * d540eeb build: добавлен файл проекта * 754a479 code: заготовка программы // изменение типа данных с машины Алисы ^ // //