diff --git a/README.md b/README.md index 4872ba2..ae8f301 100644 --- a/README.md +++ b/README.md @@ -273,3 +273,97 @@ d2cf070 build f3f5271 code: заготовка программы +Мария@Note-Mary MINGW64 ~/Desktop/lab02/alice/project (main) +$ git pull +Enter passphrase for key '/c/Users/Мария/.ssh/id_rsa': +Updating 6b0ae13..82762b6 +Fast-forward + README.md | 275 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + main.cpp | 19 +++-- + 2 files changed, 286 insertions(+), 8 deletions(-) + +Мария@Note-Mary MINGW64 ~/Desktop/lab02/alice/project (main) +$ git log --graph --all --decorate --oneline +* 82762b6 (HEAD -> main, origin/main, origin/HEAD) record +* dfff074 record +* 998c172 . +* 6b0ae13 min bob +* da439d7 del al +| * 1b91802 (double) double +| * eeb2598 max al +|/ +* 261c99c mult bob +* 992780d first commit +* 3fa2b6a git +* 3b4f949 added search for the sum and dif +* 3c32ed0 added search for the sum of numbers +* d2cf070 build +* f3f5271 code: заготовка программы + +Мария@Note-Mary MINGW64 ~/Desktop/lab02/alice/project (main) +$ git checkout double +Switched to branch 'double' + +Мария@Note-Mary MINGW64 ~/Desktop/lab02/alice/project (double) +$ git checkout - +Switched to branch 'main' +Your branch is up to date with 'origin/main'. +Соединение с веткой double +Мария@Note-Mary MINGW64 ~/Desktop/lab02/alice/project (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. + +Мария@Note-Mary MINGW64 ~/Desktop/lab02/alice/project (main|MERGING) +$ git add main.cpp + +Мария@Note-Mary MINGW64 ~/Desktop/lab02/alice/project (main|MERGING) +$ git commit -m "done" +[main 36ea1da] done + +Мария@Note-Mary MINGW64 ~/Desktop/lab02/alice/project (main) +$ git merge double +Already up to date. + +Мария@Note-Mary MINGW64 ~/Desktop/lab02/alice/project (main) +$ git pull +Enter passphrase for key '/c/Users/Мария/.ssh/id_rsa': +Already up to date. + +Мария@Note-Mary MINGW64 ~/Desktop/lab02/alice/project (main) +$ git push +Enter passphrase for key '/c/Users/Мария/.ssh/id_rsa': +Enumerating objects: 13, done. +Counting objects: 100% (13/13), done. +Delta compression using up to 8 threads +Compressing objects: 100% (9/9), done. +Writing objects: 100% (9/9), 874 bytes | 437.00 KiB/s, done. +Total 9 (delta 6), reused 0 (delta 0), pack-reused 0 +remote: . Processing 1 references +remote: Processed 1 references in total +To uit.mpei.ru:KarelinaMK/cs-lab02.git + 82762b6..36ea1da main -> main + +Мария@Note-Mary MINGW64 ~/Desktop/lab02/alice/project (main) +$ git log --graph --all --decorate --oneline +* 36ea1da (HEAD -> main, origin/main, origin/HEAD) done +|\ +| * 1b91802 (double) double +| * eeb2598 max al +* | 82762b6 record +* | dfff074 record +* | 998c172 . +* | 6b0ae13 min bob +* | da439d7 del al +|/ +* 261c99c mult bob +* 992780d first commit +* 3fa2b6a git +* 3b4f949 added search for the sum and dif +* 3c32ed0 added search for the sum of numbers +* d2cf070 build +* f3f5271 code: заготовка программы + +Мария@Note-Mary MINGW64 ~/Desktop/lab02/alice/project (main) +$