Лыжин Антон А-03-24 ОС: Windows 10 ---------------------------------------------- ВХОД В ТЕРМИНАЛ И СОЗДАНИЕ СТРУКТУРЫ КАТАЛОГОВ ---------------------------------------------- Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02 $ mkdir alice Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02 $ mkdir bob Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02 $ cd alice Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/alice $ mkdir project Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/alice $ cd project ------------------------- ИНИЦИАЛИЗАЦИЯ РЕПОЗИТОРИЯ ------------------------- Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/alice/project $ git init Initialized empty Git repository in C:/Users/Тоха 777/OneDrive/Desktop/lab02/ali ce/project/.git/ Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/alice/project (master) $ git branch -m main Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/alice/project (main) $ git config user.name 'Alice (LyzhinAK)' git config user.email 'LyzhinAK@mpei.ru' ----------------------------- ЗАНЕСЕНИЕ ПОД КОНТРОЛЬ ВЕРСИЙ ----------------------------- Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/alice/project (main) $ git status On branch main No commits yet Untracked files: (use "git add ..." to include in what will be committed) bin/ main.cpp obj/ project.cbp project.layout nothing added to commit but untracked files present (use "git add" to track) Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/alice/project (main) $ git add main.cpp Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/alice/project (main) $ git commit -m 'code: заготовка программы' [main (root-commit) 29ed3cb] code: заготовка программы 1 file changed, 9 insertions(+) create mode 100644 main.cpp -------------------- СООБЩЕНИЯ К КОММИТАМ -------------------- Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/alice/project (main) $ git add project.cbp warning: in the working copy of 'project.cbp', LF will be replaced by CRLF the n ext time Git touches it Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/alice/project (main) $ git commit -m "build: add project file" [main eecc227] build: add project file 1 file changed, 40 insertions(+) create mode 100644 project.cbp -------------------- КОМИИТЫ К ИЗМЕНЕНИЯМ -------------------- Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/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.layout no changes added to commit (use "git add" and/or "git commit -a") Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/alice/project (main) $ git add main.cpp Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/alice/project (main) $ git commit -m "code: ввод" [main 190008e] code: ввод 1 file changed, 3 insertions(+), 1 deletion(-) Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/alice/project (main) $ git add -u Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/alice/project (main) $ git commit -m "code: сумма" [main da478ca] code: сумма 1 file changed, 1 insertion(+) Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/alice/project (main) $ git commit -a -m "code: разность" [main c446d90] code: разность 1 file changed, 2 insertions(+), 1 deletion(-) -------------------- ИГНОРИРОВАНИЕ ФАЙЛОВ -------------------- Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/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) Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/alice/project (main) $ git add .gitignore Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/alice/project (main) $ git commit -m "git: ignore" [main 12a971f] git: ignore 1 file changed, 3 insertions(+) create mode 100644 .gitignore ---------------- ПРОСМОТР ИСТОРИИ ---------------- Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/alice/project (main) $ git log --stat commit 12a971f2f21b0314803c3f308ab993c12f44dbc1 (HEAD -> main) Author: Alice (LyzhinAK) Date: Sun Apr 20 16:10:23 2025 +0300 git: ignore .gitignore | 3 +++ 1 file changed, 3 insertions(+) commit c446d907077935f7b594a743ea0db7289492ba37 Author: Alice (LyzhinAK) Date: Sun Apr 20 16:08:10 2025 +0300 code: разность main.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) commit da478cab470f4688515190a1c235487ae1b4e6e6 Author: Alice (LyzhinAK) Date: Sun Apr 20 16:07:38 2025 +0300 code: сумма Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/alice/project (main) $ git log --oneline --decorate 12a971f (HEAD -> main) git: ignore c446d90 code: разность da478ca code: сумма 190008e code: ввод eecc227 build: add project file 29ed3cb code: заготовка программы Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/alice/project (main) $ git log --oneline --decorate --all --graph * 12a971f (HEAD -> main) git: ignore * c446d90 code: разность * da478ca code: сумма * 190008e code: ввод * eecc227 build: add project file * 29ed3cb code: заготовка программы Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/alice/project (main) $ git log --grep "build: " commit eecc227bb52993db65e8fe7d789913ffc3c7b49e Author: Alice (LyzhinAK) Date: Sun Apr 20 16:05:39 2025 +0300 build: add project file Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/alice/project (main) $ git log -- project.cbp commit eecc227bb52993db65e8fe7d789913ffc3c7b49e Author: Alice (LyzhinAK) Date: Sun Apr 20 16:05:39 2025 +0300 build: add project file ----------------- ПРОСМОТР КОММИТОВ ----------------- Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/alice/project (main) $ git show HEAD~1 commit c446d907077935f7b594a743ea0db7289492ba37 Author: Alice (LyzhinAK) Date: Sun Apr 20 16:08:10 2025 +0300 code: разность diff --git a/main.cpp b/main.cpp index 6de6dd2..5371b30 100644 --- a/main.cpp +++ b/main.cpp @@ -7,6 +7,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'; return 0; } Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/alice/project (main) $ git show main~1 commit c446d907077935f7b594a743ea0db7289492ba37 Author: Alice (LyzhinAK) Date: Sun Apr 20 16:08:10 2025 +0300 code: разность diff --git a/main.cpp b/main.cpp index 6de6dd2..5371b30 100644 --- a/main.cpp +++ b/main.cpp @@ -7,6 +7,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'; return 0; } Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/alice/project (main) $ git show c446d90 commit c446d907077935f7b594a743ea0db7289492ba37 Author: Alice (LyzhinAK) Date: Sun Apr 20 16:08:10 2025 +0300 code: разность diff --git a/main.cpp b/main.cpp index 6de6dd2..5371b30 100644 --- a/main.cpp +++ b/main.cpp @@ -7,6 +7,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'; return 0; } ------------------ ПРОСМОТР ИЗМЕНЕНИЙ ------------------ Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/alice/project (main) $ git diff diff --git a/main.cpp b/main.cpp index 5371b30..fbd9488 100644 --- a/main.cpp +++ b/main.cpp @@ -8,6 +8,7 @@ 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'; return 0; } Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/alice/project (main) $ git diff 29ed3cb c446d90 diff --git a/main.cpp b/main.cpp index b4392ec..5371b30 100644 --- a/main.cpp +++ b/main.cpp @@ -4,6 +4,10 @@ using namespace std; int main() { - cout << "Hello world!" << endl; + cout << "Enter A and B: "; + int a, b; + cin >> a >> b; + cout << "A + B = " << a + b << '\n' + << "A - B = " << a - b << '\n'; return 0; } diff --git a/project.cbp b/project.cbp new file mode 100644 index 0000000..99bb702 --- /dev/null +++ b/project.cbp @@ -0,0 +1,40 @@ + Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/alice/project (main) $ git show HEAD commit 12a971f2f21b0314803c3f308ab993c12f44dbc1 (HEAD -> main) Author: Alice (LyzhinAK) Date: Sun Apr 20 16:10:23 2025 +0300 git: ignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d85abef --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +/bin +/obj +/*.layout Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/alice/project (main) $ git add main.cpp Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/alice/project (main) $ git commit -m "code: произведение" [main 0f73d92] code: произведение 1 file changed, 2 insertions(+), 1 deletion(-) --------------- ОТКАТ ИЗМЕНЕНИЙ --------------- Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/alice/project (main) $ git reset --hard HEAD~1 HEAD is now at 12a971f git: ignore Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/alice/project (main) $ git checkout HEAD -- main.cpp -------- ОТПРАВКА -------- Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/alice/project (main) $ git remote add origin git@uit.mpei.ru:LyzhinAK/cs-lab02.git Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/alice/project (main) $ git push -u origin main git@uit.mpei.ru's password: Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/alice/project (main) $ eval $(ssh-agent -s) Agent pid 622 Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/alice/project (main) $ ssh-add /c/yHuK/pass Enter passphrase for /c/yHuK/pass: Identity added: /c/yHuK/pass (Тоха 777@ANALCRASHER) Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/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 12 threads Compressing objects: 100% (16/16), done. Writing objects: 100% (18/18), 2.19 KiB | 172.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 uit.mpei.ru:LyzhinAK/cs-lab02.git * [new branch] main -> main branch 'main' set up to track 'origin/main'. Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/alice/project (main) $ git remote -v origin git@uit.mpei.ru:LyzhinAK/cs-lab02.git (fetch) origin git@uit.mpei.ru:LyzhinAK/cs-lab02.git (push) --------- ПОЛУЧЕНИЕ --------- Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/bob $ eval $(ssh-agent -s) Agent pid 671 Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/bob $ ssh-add /c/yHuK/pass Enter passphrase for /c/yHuK/pass: Identity added: /c/yHuK/pass (Тоха 777@ANALCRASHER) Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/bob $ git clone git@uit.mpei.ru:LyzhinAK/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), done. Resolving deltas: 100% (2/2), done. Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/bob $ cd project Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/bob/project (main) $ git config user.name 'Bob (LyzhinAK)' git config user.email 'LyzhinAK@mpei.ru' ----------------- СОВМЕСТНАЯ РАБОТА ----------------- Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/bob/project (main) $ git add main.cpp Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/bob/project (main) $ git commit -m "code: произведение" [main 7ef26ec] code: произведение 1 file changed, 2 insertions(+), 1 deletion(-) Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/bob/project (main) $ git push Enumerating objects: 5, done. Counting objects: 100% (5/5), done. Delta compression using up to 12 threads Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 395 bytes | 197.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 uit.mpei.ru:LyzhinAK/cs-lab02.git 12a971f..7ef26ec main -> main Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/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), 375 bytes | 37.00 KiB/s, done. From uit.mpei.ru:LyzhinAK/cs-lab02 12a971f..7ef26ec main -> origin/main Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/alice/project (main) $ git log --oneline --decorate --all --graph * 7ef26ec (origin/main, origin/HEAD) code: произведение * 12a971f (HEAD -> main) git: ignore * c446d90 code: разность * da478ca code: сумма * 190008e code: ввод * eecc227 build: add project file * 29ed3cb code: заготовка программы Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/alice/project (main) $ git pull --ff-only Updating 12a971f..7ef26ec Fast-forward main.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/alice/project (main) $ git add main.cpp Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/alice/project (main) $ git commit -m "code: деление" [main 664b7f6] code: деление 1 file changed, 2 insertions(+), 1 deletion(-) Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/alice/project (main) $ git push Enumerating objects: 5, done. Counting objects: 100% (5/5), done. Delta compression using up to 12 threads Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 400 bytes | 200.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 uit.mpei.ru:LyzhinAK/cs-lab02.git 7ef26ec..664b7f6 main -> main Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/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), 380 bytes | 18.00 KiB/s, done. From uit.mpei.ru:LyzhinAK/cs-lab02 7ef26ec..664b7f6 main -> origin/main Updating 7ef26ec..664b7f6 Fast-forward main.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --------------------- РАЗРЕШЕНИЕ КОНФЛИКТОВ --------------------- Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/alice/project (main) $ git add main.cpp Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/alice/project (main) $ git commit -m "code: максимум" [main 88609ec] code: максимум 1 file changed, 2 insertions(+) Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/alice/project (main) $ git push Enumerating objects: 5, done. Counting objects: 100% (5/5), done. Delta compression using up to 12 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 uit.mpei.ru:LyzhinAK/cs-lab02.git 664b7f6..88609ec main -> main Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/bob/project (main) $ git add main.cpp Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/bob/project (main) $ git commit -m "code: минимум" [main 990ebd8] code: минимум 1 file changed, 2 insertions(+) Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/bob/project (main) $ git push To uit.mpei.ru:LyzhinAK/cs-lab02.git ! [rejected] main -> main (fetch first) error: failed to push some refs to 'uit.mpei.ru:LyzhinAK/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. Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/bob/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), 390 bytes | 7.00 KiB/s, done. From uit.mpei.ru:LyzhinAK/cs-lab02 664b7f6..88609ec main -> origin/main Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/bob/project (main) $ git log --oneline --decorate --all --graph * 990ebd8 (HEAD -> main) code: минимум | * 88609ec (origin/main, origin/HEAD) code: максимум |/ * 664b7f6 code: деление * 7ef26ec code: произведение * 12a971f git: ignore * c446d90 code: разность * da478ca code: сумма * 190008e code: ввод * eecc227 build: add project file * 29ed3cb code: заготовка программы Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/bob/project (main) $ git rebase origin/main Auto-merging main.cpp CONFLICT (content): Merge conflict in main.cpp error: could not apply 990ebd8... code: минимум hint: Resolve all conflicts manually, mark them as resolved with hint: "git add/rm ", then run "git rebase --continue". hint: You can instead skip this commit: run "git rebase --skip". hint: To abort and get back to the state before "git rebase", run "git rebase -- abort". hint: Disable this message with "git config set advice.mergeConflict false" Could not apply 990ebd8... code: минимум [detached HEAD 04f3153] code: минимум 1 file changed, 2 insertions(+) Successfully rebased and updated refs/heads/main. Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/bob/project (main) $ git log --oneline --decorate --all --graph * 04f3153 (HEAD -> main) code: минимум * 88609ec (origin/main, origin/HEAD) code: максимум * 664b7f6 code: деление * 7ef26ec code: произведение * 12a971f git: ignore * c446d90 code: разность * da478ca code: сумма * 190008e code: ввод * eecc227 build: add project file * 29ed3cb code: заготовка программы ----- ВЕТКА ----- Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/alice/project (main) $ git branch double Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/alice/project (main) $ git checkout double Switched to branch 'double' Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/alice/project (double) $ git add main.cpp Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/alice/project (double) $ git commit -m "code: double" [double 00a3f48] code: double 1 file changed, 1 insertion(+), 1 deletion(-) Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/alice/project (double) $ git checkout main Switched to branch 'main' Your branch is up to date with 'origin/main'. Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/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), 367 bytes | 7.00 KiB/s, done. From uit.mpei.ru:LyzhinAK/cs-lab02 88609ec..04f3153 main -> origin/main Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/alice/project (main) $ git log --oneline --decorate --all --graph * 00a3f48 (double) code: double | * 04f3153 (origin/main, origin/HEAD) code: минимум |/ * 88609ec (HEAD -> main) code: максимум * 664b7f6 code: деление * 7ef26ec code: произведение * 12a971f git: ignore * c446d90 code: разность * da478ca code: сумма * 190008e code: ввод * eecc227 build: add project file * 29ed3cb code: заготовка программы Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/alice/project (main) $ git merge double Updating 88609ec..00a3f48 Fast-forward main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/alice/project (main) $ git push To uit.mpei.ru:LyzhinAK/cs-lab02.git ! [rejected] main -> main (non-fast-forward) error: failed to push some refs to 'uit.mpei.ru:LyzhinAK/cs-lab02.git' hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. If you want to integrate the remote changes, hint: use 'git pull' before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/alice/project (main) $ git log --oneline --decorate --all --graph * 00a3f48 (HEAD -> main, double) code: double | * 04f3153 (origin/main, origin/HEAD) code: минимум |/ * 88609ec code: максимум * 664b7f6 code: деление * 7ef26ec code: произведение * 12a971f git: ignore * c446d90 code: разность * da478ca code: сумма * 190008e code: ввод * eecc227 build: add project file * 29ed3cb code: заготовка программы git pull Auto-merging main.cpp Merge made by the 'ort' strategy. main.cpp | 2 ++ 1 file changed, 2 insertions(+) Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/alice/project (main) $ git push Enumerating objects: 10, done. Counting objects: 100% (10/10), done. Delta compression using up to 12 threads Compressing objects: 100% (6/6), done. Writing objects: 100% (6/6), 701 bytes | 140.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 uit.mpei.ru:LyzhinAK/cs-lab02.git 04f3153..b69b2f3 main -> main Тоха 777@ANALCRASHER MINGW64 ~/OneDrive/Desktop/lab02/alice/project (main) $ git log --oneline --decorate --all --graph * b69b2f3 (HEAD -> main, origin/main, origin/HEAD) Merge branch 'main' of uit.m pei.ru:LyzhinAK/cs-lab02 |\ | * 04f3153 code: минимум * | 00a3f48 (double) code: double |/ * 88609ec code: максимум * 664b7f6 code: деление * 7ef26ec code: произведение * 12a971f git: ignore * c446d90 code: разность * da478ca code: сумма * 190008e code: ввод * eecc227 build: add project file * 29ed3cb code: заготовка программы