From a40fa75fbce3971120fc6f82af52eb92a2448393 Mon Sep 17 00:00:00 2001 From: ArtemenkoAY Date: Mon, 31 Mar 2025 12:54:33 +0000 Subject: [PATCH] =?UTF-8?q?=D0=97=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=B8?= =?UTF-8?q?=D0=BB(=D0=B0)=20=D1=84=D0=B0=D0=B9=D0=BB=D1=8B=20=D0=B2=20''?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...±ΠΎΡ‚Π΅ β„–2 АртСмСнко А.Π•..txt | 895 ++++++++++++++++++ 1 file changed, 895 insertions(+) create mode 100644 ΠžΡ‚Ρ‡Π΅Ρ‚ ΠΏΠΎ Π»Π°Π±ΠΎΡ€Π°Ρ‚ΠΎΡ€Π½ΠΎΠΉ Ρ€Π°Π±ΠΎΡ‚Π΅ β„–2 АртСмСнко А.Π•..txt diff --git a/ΠžΡ‚Ρ‡Π΅Ρ‚ ΠΏΠΎ Π»Π°Π±ΠΎΡ€Π°Ρ‚ΠΎΡ€Π½ΠΎΠΉ Ρ€Π°Π±ΠΎΡ‚Π΅ β„–2 АртСмСнко А.Π•..txt b/ΠžΡ‚Ρ‡Π΅Ρ‚ ΠΏΠΎ Π»Π°Π±ΠΎΡ€Π°Ρ‚ΠΎΡ€Π½ΠΎΠΉ Ρ€Π°Π±ΠΎΡ‚Π΅ β„–2 АртСмСнко А.Π•..txt new file mode 100644 index 0000000..392da95 --- /dev/null +++ b/ΠžΡ‚Ρ‡Π΅Ρ‚ ΠΏΠΎ Π»Π°Π±ΠΎΡ€Π°Ρ‚ΠΎΡ€Π½ΠΎΠΉ Ρ€Π°Π±ΠΎΡ‚Π΅ β„–2 АртСмСнко А.Π•..txt @@ -0,0 +1,895 @@ +ΠžΡ‚Ρ‡Ρ‘Ρ‚ ΠΏΠΎ Π»Π°Π±ΠΎΡ€Π°Ρ‚ΠΎΡ€Π½ΠΎΠΉ Ρ€Π°Π±ΠΎΡ‚Π΅ β„–2 «БистСма контроля вСрсий GitΒ» + +Π’Ρ‹ΠΏΠΎΠ»Π½ΠΈΠ»Π°: АртСмСнко А.Π•. +Π“Ρ€ΡƒΠΏΠΏΠ°: А-01-24 + +1. Π’Ρ…ΠΎΠ΄ Π² Ρ‚Π΅Ρ€ΠΌΠΈΠ½Π°Π» ΠΈ созданиС структуры ΠΊΠ°Ρ‚Π°Π»ΠΎΠ³ΠΎΠ² +Боздаю Π½Π° Ρ€Π°Π±ΠΎΡ‡Π΅ΠΌ столС ΠΊΠ°Ρ‚Π°Π»ΠΎΠ³ lab02 ΠΈ Π·Π°ΠΏΡƒΡΠΊΠ°ΡŽ Π² Π½Ρ‘ΠΌ Git Bash, ΠΌΠ½Π΅ Π²Ρ‹Π²ΠΎΠ΄ΠΈΡ‚ ΠΏΡ€ΠΈΠ³Π»Π°ΡˆΠ΅Π½ΠΈΠ΅: +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02 +$ +Π‘ΠΌΠΎΡ‚Ρ€ΡŽ Ρ„Π°ΠΉΠ»Ρ‹ Π² Ρ€Π°Π±ΠΎΡ‡Π΅ΠΌ ΠΊΠ°Ρ‚Π°Π»ΠΎΠ³Π΅ с ΠΏΠΎΠΌΠΎΡ‰ΡŒΡŽ ΠΊΠΎΠΌΠ°Π½Π΄Ρ‹ ls, Ρ‚Π°ΠΊ ΠΊΠ°ΠΊ Π² ΠΊΠ°Ρ‚Π°Π»ΠΎΠ³Π΅ пусто, ls Π½ΠΈΡ‡Π΅Π³ΠΎ Π½Π΅ Π²Ρ‹Π²ΠΎΠ΄ΠΈΡ‚: +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02 +$ ls +Боздаю ΠΏΠ°ΠΏΠΊΠΈ Алисы ΠΈ Π‘ΠΎΠ±Π°: +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02 +$ mkdir alice + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02 +$ mkdir bob + +ΠŸΠ΅Ρ€Π΅Ρ…ΠΎΠΆΡƒ Π² ΠΊΠ°Ρ‚Π°Π»ΠΎΠ³ Алисы с ΠΏΠΎΠΌΠΎΡ‰ΡŒΡŽ ΠΊΠΎΠΌΠ°Π½Π΄Ρ‹ cd ΠΈ создаю Π² Π½Π΅ΠΉ ΠΏΠ°ΠΏΠΊΡƒ project. +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02 +$ cd alice + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice +$ mkdir project +Π’Ρ‹ΠΏΠΎΠ»Π½ΡΡŽ Π²Ρ…ΠΎΠ΄ Π² ΠΊΠ°Ρ‚Π°Π»ΠΎΠ³ cd, Π° послС поднимаю Π½Π° ΡƒΡ€ΠΎΠ²Π΅Π½ΡŒ Π²Ρ‹ΡˆΠ΅ cd .. ΠΈ снова Π²ΠΎΠ·Π²Ρ€Π°Ρ‰Π°ΡŽΡΡŒ Π² ΠΏΠ°ΠΏΠΊΡƒ project +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice +$ cd project + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project +$ cd .. + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice +$ cd project + +1. Π˜Π½ΠΈΡ†ΠΈΠ°Π»ΠΈΠ·Π°Ρ†ΠΈΡ рСпозитария ΠΈ настройка Git +Π˜Π½ΠΈΡ†ΠΈΠ°Π»ΠΈΠ·ΠΈΡ€ΡƒΠ΅ΠΌ Ρ€Π΅ΠΏΠΎΠ·ΠΈΡ‚ΠΎΡ€ΠΈΠΉ Π² Ρ‚Π΅ΠΊΡƒΡ‰Π΅ΠΌ ΠΊΠ°Ρ‚Π°Π»ΠΎΠ³Π΅ project: +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project +$ git init +Initialized empty Git repository in C:/Users/user/Desktop/lab02/alice/project/.git/ + +К ΠΏΡ€ΠΈΠ³Π»Π°ΡˆΠ΅Π½ΠΈΡŽ ΠΊΠΎΠΌΠ°Π½Π΄Π½ΠΎΠΉ строки добавилось (master): имя Ρ‚Π΅ΠΊΡƒΡ‰ΠΈΠΉ Π²Π΅Ρ‚Π²ΠΈ Git. + +МСняю Ρ‚Π΅ΠΊΡƒΡ‰Π΅Π΅ имя Π²Π΅Ρ‚Π²ΠΈ master Π½Π° имя main. + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (master) +$ git branch -m main + +ΠΠ°ΡΡ‚Ρ€Π°ΠΈΠ²Π°ΡŽ Ρ€Π΅ΠΏΠΎΠ·ΠΈΡ‚Π°Ρ€ΠΈΠΉ Алисы: +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (main) +$ git config user.name 'Alice (ArtemenkoAY)' + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (main) +$ git config user.email 'ArtemenkoAY@mpei.ru' + +2. Π‘ΠΎΠ·Π΄Π°Π½ΠΈΠ΅ ΠΊΠΎΠΌΠΌΠΈΡ‚ΠΎΠ² +ΠŸΠΎΡΠΌΠΎΡ‚Ρ€ΠΈΠΌ состояниС Ρ€Π°Π±ΠΎΡ‡Π΅ΠΉ ΠΊΠΎΠΏΠΈΠΈ: +user@WIN-0E2RN91IREF MINGW64 ~/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) + +1 строка – Π³ΠΎΠ²ΠΎΡ€ΠΈΡ‚ ΠΎ Ρ‚ΠΎΠΌ, Ρ‡Ρ‚ΠΎ ΠΌΡ‹ находимся Π½Π° Π²Π΅Ρ‚ΠΊΠ΅ main. +2 строка – Π³ΠΎΠ²ΠΎΡ€ΠΈΡ‚ ΠΎ Ρ‚ΠΎΠΌ, Ρ‡Ρ‚ΠΎ ΠΊΠΎΠΌΠΌΠΈΡ‚Ρ‹ ΠΎΡ‚ΡΡƒΡ‚ΡΡ‚Π²ΡƒΡŽΡ‚. +3, 5-7 строки – ΠΏΠΎΠΊΠ°Π·Ρ‹Π²Π°Π΅Ρ‚ Ρ„Π°ΠΉΠ»Ρ‹, ΠΊΠΎΡ‚ΠΎΡ€Ρ‹Π΅ Π½Π΅ ΠΎΡ‚ΡΠ»Π΅ΠΆΠΈΠ²Π°ΡŽΡ‚ΡΡ git. +4 строка – подсказываСт, ΠΊΠ°ΠΊ ΡΠΎΠ·Π΄Π°Ρ‚ΡŒ ΠΊΠΎΠΌΠΌΠΈΡ‚. +8 строка – подсказываСт, Ρ‡Ρ‚ΠΎ Π½Π΅Ρ‚ ΠΊΠΎΠΌΠΌΠΈΡ‚ΠΎΠΌ, Π½ΠΎ Π΅ΡΡ‚ΡŒ Π½Π΅ отслСТиваСмыС Ρ„Π°ΠΉΠ»Ρ‹, ΠΊΠΎΡ‚ΠΎΡ€Ρ‹Π΅ ΠΌΠΎΠΆΠ½ΠΎ Π·Π°ΠΊΠΎΠΌΠΌΠΈΡ‚ΠΈΡ‚ΡŒ. + +Π”ΠΎΠ±Π°Π²ΠΈΠΌ Ρ„Π°ΠΉΠ» main.cpp Π² индСкс, Ρ‚ΠΎ Π΅ΡΡ‚ΡŒ Π² Π½Π°Π±ΠΎΡ€ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ, ΠΊΠΎΡ‚ΠΎΡ€Ρ‹ΠΉ Π²ΠΎΠΉΠ΄Π΅Ρ‚ Π² ΠΎΡ‡Π΅Ρ€Π΅Π΄Π½ΠΎΠΉ ΠΊΠΎΠΌΠΌΠΈΡ‚: + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (main) +$ git add main.cpp + +Π‘ΠΌΠΎΡ‚Ρ€ΡŽ состояниС Ρ€Π°Π±ΠΎΡ‡Π΅ΠΉ ΠΊΠΎΠΏΠΈΠΈ: + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (main) +$ git status +On branch main +Changes to be committed: + (use "git restore --staged ..." to unstage) + new file: main.cpp + +Untracked files: + (use "git add ..." to include in what will be committed) + bin/ + obj/ + project.cbp + project.layout + +Появилась строка с Ρ„Π°ΠΉΠ»ΠΎΠΌ, ΠΊΠΎΡ‚ΠΎΡ€Ρ‹ΠΉ ΠΌΠΎΠΆΠ½ΠΎ Π΄ΠΎΠ±Π°Π²ΠΈΡ‚ΡŒ Π² ΠΊΠΎΠΌΠΌΠΈΡ‚. +Π’Ρ‹ΠΏΠΎΠ»Π½ΠΈΠΌ ΠΊΠΎΠΌΠΌΠΈΡ‚ с Ρ„Π°ΠΉΠ»ΠΎΠΌ main.cpp ΠΈ ΠΊΠΎΡ€ΠΎΡ‚ΠΊΠΈΠΌ сообщСниСм: +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (main) +$ git commit -m 'code: Π·Π°Π³ΠΎΡ‚ΠΎΠ²ΠΊΠ° ΠΏΡ€ΠΎΠ³Ρ€Π°ΠΌΠΌΡ‹' +[main (root-commit) f4f7fa5] code: Π·Π°Π³ΠΎΡ‚ΠΎΠ²ΠΊΠ° ΠΏΡ€ΠΎΠ³Ρ€Π°ΠΌΠΌΡ‹ + 1 file changed, 9 insertions(+) + create mode 100644 main.cpp + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (main) +$ git status +On branch main +Untracked files: + (use "git add ..." to include in what will be committed) + bin/ + obj/ + project.cbp + project.layout + +nothing added to commit but untracked files present (use "git add" to track) + +Π’Π΅ΠΏΠ΅Ρ€ΡŒ Π΄ΠΎΠ±Π°Π²ΠΈΠΌ Ρ„Π°ΠΉΠ» project.cbp, Ρ‚.Π΅. ΠΏΡ€ΠΎΠ΄Π΅Π»Π°Π΅ΠΌ Ρ‚ΠΎΡ‚ ΠΆΠ΅ самый Π°Π»Π³ΠΎΡ€ΠΈΡ‚ΠΌ + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (main) +$ git add project.cbp +warning: in the working copy of 'project.cbp', LF will be replaced by CRLF the next time Git touches it + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (main) +$ git status +On branch main +Changes to be committed: + (use "git restore --staged ..." to unstage) + new file: project.cbp + +Untracked files: + (use "git add ..." to include in what will be committed) + bin/ + obj/ + project.layout + +Π’Ρ‹ΠΏΠΎΠ»Π½ΠΈΠΌ ΠΊΠΎΠΌΠΌΠΈΡ‚ с Ρ„Π°ΠΉΠ»ΠΎΠΌ project.cbp ΠΈ ΠΊΠΎΡ€ΠΎΡ‚ΠΊΠΈΠΌ сообщСниСм +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (main) +$ git commit -m 'build: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Ρ„Π°ΠΉΠ» ΠΏΡ€ΠΎΠ΅ΠΊΡ‚Π°' +[main 6ee4e6b] build: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Ρ„Π°ΠΉΠ» ΠΏΡ€ΠΎΠ΅ΠΊΡ‚Π° + 1 file changed, 38 insertions(+) + create mode 100644 project.cbp + +МСняю Ρ‚Π΅Π»ΠΎ Ρ„ΡƒΠ½ΠΊΡ†ΠΈΠΈ main() Π½Π° Π²Π²ΠΎΠ΄ Π΄Π²ΡƒΡ… чисСл, ΡΠΌΠΎΡ‚Ρ€ΡŽ состояниС рСпозитория: + +user@WIN-0E2RN91IREF 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.layout + +no changes added to commit (use "git add" and/or "git commit -a") + +1 строка – Π³ΠΎΠ²ΠΎΡ€ΠΈΡ‚ ΠΎ Ρ‚ΠΎΠΌ, Ρ‡Ρ‚ΠΎ ΠΌΡ‹ находимся Π½Π° основной Π²Π΅Ρ‚ΠΊΠ΅. +2-4 строки – ΠΏΡ€Π΅Π΄Π»Π°Π³Π°ΡŽΡ‚ ΡƒΠ΄Π°Π»ΠΈΡ‚ΡŒ измСнСния ΠΈΠ»ΠΈ ΠΎΠ±Π½ΠΎΠ²ΠΈΡ‚ΡŒ ΠΊΠΎΠΌΠΌΠΈΡ‚. +5 - строка ΠΏΠΈΡˆΠ΅Ρ‚, Ρ‡Ρ‚ΠΎ Ρ„Π°ΠΉΠ» main.cpp Π±Ρ‹Π» ΠΈΠ·ΠΌΠ΅Π½Π΅Π½. +6-10 строки – Π½Π΅ отслСТиваСмыС Ρ„Π°ΠΉΠ»Ρ‹. + +ΠŸΡ€ΠΎΠ΄Π΅Π»Ρ‹Π²Π°Π΅ΠΌ ряд ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ с ΠΊΠΎΠ΄ΠΎΠΌ ΠΏΡ€ΠΎΠ³Ρ€Π°ΠΌΠΌΡ‹ ΠΈ Π΄Π΅Π»Π°Π΅ΠΌ ΠΊΠΎΠΌΠΌΠΈΡ‚Ρ‹ суммы ΠΈ разности: + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (main) +$ git add main.cpp + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (main) +$ git commit -m 'code: Π²Ρ‹Π²ΠΎΠ΄ суммы' +[main 13bafc2] code: Π²Ρ‹Π²ΠΎΠ΄ суммы + 1 file changed, 5 insertions(+), 2 deletions(-) + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (main) +$ git add -u + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (main) +$ git commit -m 'code: Π²Ρ‹Π²ΠΎΠ΄ разности' +[main 149da8c] code: Π²Ρ‹Π²ΠΎΠ΄ разности + 1 file changed, 1 insertion(+) +3. Π˜Π³Π½ΠΎΡ€ΠΈΡ€ΠΎΠ²Π°Π½ΠΈΠ΅ Ρ„Π°ΠΉΠ»ΠΎΠ² +Боздаю Π² CodeBlocks Ρ„Π°ΠΉΠ» .gitignore, Π³Π΄Π΅ Π±ΡƒΠ΄ΡƒΡ‚ написаны названия Ρ„Π°ΠΉΠ»ΠΎΠ², ΠΊΠΎΡ‚ΠΎΡ€Ρ‹Π΅ Π½ΡƒΠΆΠ½ΠΎ Π±ΡƒΠ΄Π΅Ρ‚ ΠΈΠ³Π½ΠΎΡ€ΠΈΡ€ΠΎΠ²Π°Ρ‚ΡŒ. Π”Π°Π½Π½Ρ‹ΠΉ Ρ„Π°ΠΉΠ» Ρ‚Π°ΠΊΠΆΠ΅ ΠΊΠΎΠΌΠΌΠΈΡ‡Ρƒ. +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (main) +$ git add .gitignore + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (main) +$ git commit -m 'git: ΠΈΠ³Π½ΠΎΡ€ΠΈΡ€ΠΎΠ²Π°Π½ΠΈΠ΅ Ρ„Π°ΠΉΠ»ΠΎΠ²' +[main c03016f] git: ΠΈΠ³Π½ΠΎΡ€ΠΈΡ€ΠΎΠ²Π°Π½ΠΈΠ΅ Ρ„Π°ΠΉΠ»ΠΎΠ² + 1 file changed, 4 insertions(+) + create mode 100644 .gitignore + +ΠŸΡ€ΠΎΠ²Π΅Ρ€ΡΡŽ, Ρ‡Ρ‚ΠΎΠ±Ρ‹ Π½Π΅ΠΎΠ±Ρ…ΠΎΠ΄ΠΈΠΌΡ‹Π΅ Ρ„Π°ΠΉΠ»Ρ‹ ΠΈ ΠΊΠ°Ρ‚Π°Π»ΠΎΠ³ΠΈ Π½Π΅ ΠΎΡ‚ΠΎΠ±Ρ€Π°ΠΆΠ°Π»ΠΈΡΡŒ: +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (main) +$ git status +On branch main +nothing to commit, working tree clean + +4. ΠŸΡ€ΠΎΡΠΌΠΎΡ‚Ρ€ истории +Π Π°Π±ΠΎΡ‚Π° с ΠΆΡƒΡ€Π½Π°Π»ΠΎΠΌ рСпозитария: +Команда git log --stat, которая ΠΏΠΎΠΊΠ°Π·Ρ‹Π²Π°Π΅Ρ‚ Ρ„Π°ΠΉΠ»Ρ‹, ΠΈΠ·ΠΌΠ΅Π½Ρ‘Π½Π½Ρ‹Π΅ Π² ΠΊΠΎΠΌΠΌΠΈΡ‚Π°Ρ…: +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (main) +$ git log --stat +commit c03016f9f6abb51433cd08096949acef2648472c (HEAD -> main) +commit c03016f9f6abb51433cd08096949acef2648472c (HEAD -> main) +Author: Alice (ArtemenkoAY) +Date: Sun Mar 23 19:51:53 2025 +0300 + + git: ΠΈΠ³Π½ΠΎΡ€ΠΈΡ€ΠΎΠ²Π°Π½ΠΈΠ΅ Ρ„Π°ΠΉΠ»ΠΎΠ² + + .gitignore | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 149da8cbebafc64e97026448c62d0ca592f1b1a7 +Author: Alice (ArtemenkoAY) +Date: Sun Mar 23 19:41:41 2025 +0300 + + code: Π²Ρ‹Π²ΠΎΠ΄ разности + + main.cpp | 1 + + 1 file changed, 1 insertion(+) + +commit 13bafc29058a21adaec5542b3d8f901bd397c7ed +Author: Alice (ArtemenkoAY) +Date: Sun Mar 23 19:39:44 2025 +0300 + + code: Π²Ρ‹Π²ΠΎΠ΄ суммы + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (main) +$ git log --main.cpp +fatal: unrecognized argument: --main.cpp + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (main) +$ git log -- main.cpp +commit 149da8cbebafc64e97026448c62d0ca592f1b1a7 +Author: Alice (ArtemenkoAY) +Date: Sun Mar 23 19:41:41 2025 +0300 + + code: Π²Ρ‹Π²ΠΎΠ΄ разности + +commit 13bafc29058a21adaec5542b3d8f901bd397c7ed +Author: Alice (ArtemenkoAY) +Date: Sun Mar 23 19:39:44 2025 +0300 + + code: Π²Ρ‹Π²ΠΎΠ΄ суммы + +commit f4f7fa5d1bb021ac6732ce0ba0fd23d0b9cc0c01 +Author: Alice (ArtemenkoAY) +Date: Sun Mar 23 19:32:18 2025 +0300 + + code: Π·Π°Π³ΠΎΡ‚ΠΎΠ²ΠΊΠ° ΠΏΡ€ΠΎΠ³Ρ€Π°ΠΌΠΌΡ‹ + +Для послСднСго ΠΊΠΎΠΌΠΌΠΈΡ‚Π° данная ΠΊΠΎΠΌΠ°Π½Π΄Π° ΠΏΠΎΠΊΠ°Π·Ρ‹Π²Π°Π΅Ρ‚: +1 строка - Ρ…ΡΡˆ ΠΊΠΎΠΌΠΌΠΈΡ‚Π° +2 строка - Π°Π²Ρ‚ΠΎΡ€ +3 строка - Π΄Π°Ρ‚Π° ΠΈ врСмя создания +4 строка - ΠΊΠΎΠΌΠΌΠ΅Π½Ρ‚Π°Ρ€ΠΈΠΉ +5 строка - Ρ„Π°ΠΉΠ», ΠΊΠΎΡ‚ΠΎΡ€Ρ‹ΠΉ Π±Ρ‹Π» ΠΈΠ·ΠΌΠ΅Π½Ρ‘Π½, количСство ΠΈΠ·ΠΌΠ΅Π½Ρ‘Π½Π½Ρ‹Ρ… строчСк +6 строчка - статистика ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ Π΄Π°Π½Π½Ρ‹Ρ… Ρ„Π°ΠΉΠ»ΠΎΠ² + +ΠšΠΎΠΌΠΌΠΈΡ‚Ρ‹ ΠΏΠΎ Ρ‚Π΅ΠΌΠ΅ build: +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (main) +$ git log --grep 'build' +commit 6ee4e6b18ec8209422a8ac1a41d406c9cdc43ca7 +Author: Alice (ArtemenkoAY) +Date: Sun Mar 23 19:36:01 2025 +0300 + + build: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Ρ„Π°ΠΉΠ» ΠΏΡ€ΠΎΠ΅ΠΊΡ‚Π° + +ΠšΠΎΠΌΠΌΠΈΡ‚Ρ‹, Π·Π°Ρ‚Ρ€Π°Π³ΠΈΠ²Π°ΡŽΡ‰ΠΈΠ΅ project.cbp: +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (main) +$ git log -- project.cbp +commit 6ee4e6b18ec8209422a8ac1a41d406c9cdc43ca7 +Author: Alice (ArtemenkoAY) +Date: Sun Mar 23 19:36:01 2025 +0300 + + build: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Ρ„Π°ΠΉΠ» ΠΏΡ€ΠΎΠ΅ΠΊΡ‚Π° + +Π’Π°ΠΊΠΈΠΌ способом ΠΌΡ‹ просмотрСли ΠΈΠ½Ρ„ΠΎΡ€ΠΌΠ°Ρ†ΠΈΡŽ ΠΎ ΠΊΠΎΠΌΠΌΠΈΡ‚Π΅ ΠΏΠΎ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½Π½ΠΎΠΌΡƒ Ρ„Π°ΠΉΠ»Ρƒ ΠΈ ΠΏΠΎ Ρ‚Π΅ΠΌΠ΅ ΠΊΠΎΠΌΠΌΠΈΡ‚Π°. + +ΠŸΡ€ΠΎΡΠΌΠΎΡ‚Ρ€ ΠΊΠΎΠΌΠΌΠΈΡ‚ΠΎΠ²: +Π”Π°Π»Π΅Π΅ трСмя эквивалСнтными способами просматриваСм ΠΈΠ½Ρ„ΠΎΡ€ΠΌΠ°Ρ†ΠΈΡŽ ΠΎ прСдпослСднСм ΠΊΠΎΠΌΠΌΠΈΡ‚Π΅. + +1. ΠŸΡ€ΠΈ ΠΏΠΎΠΌΠΎΡ‰ΠΈ отступа Π½Π° 1 ΠΊΠΎΠΌΠΌΠΈΡ‚: +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (main) +$ git show HEAD~1 +commit 149da8cbebafc64e97026448c62d0ca592f1b1a7 +Author: Alice (ArtemenkoAY) +Date: Sun Mar 23 19:41:41 2025 +0300 + + code: Π²Ρ‹Π²ΠΎΠ΄ разности + +diff --git a/main.cpp b/main.cpp +index 1967dd8..f77bbcc 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'; ++ cout << "A - B = " << a - b << '\n'; + + } +2. ΠŸΡ€ΠΈ ΠΏΠΎΠΌΠΎΡ‰ΠΈ ΠΎΠ±Ρ€Π°Ρ‰Π΅Π½ΠΈΠΈ ΠΊ самой Π²Π΅Ρ‚ΠΊΠ΅ main ΠΈ отступу Π½Π° 1 ΠΊΠΎΠΌΠΌΠΈΡ‚: +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (main) +$ git show main~1 +commit 149da8cbebafc64e97026448c62d0ca592f1b1a7 +Author: Alice (ArtemenkoAY) +Date: Sun Mar 23 19:41:41 2025 +0300 + + code: Π²Ρ‹Π²ΠΎΠ΄ разности + +diff --git a/main.cpp b/main.cpp +index 1967dd8..f77bbcc 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'; ++ cout << "A - B = " << a - b << '\n'; + + } +3. ΠžΠ±Ρ€Π°Ρ‰Π°ΡΡΡŒ ΠΊ ΠΊΠΎΠΌΠΌΠΈΡ‚Ρƒ Ρ‡Π΅Ρ€Π΅Π· Π΅Π³ΠΎ Ρ…Π΅Ρˆ +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (main) +$ git show 149da8cbebafc64e97026448c62d0ca592f1b1a7 +commit 149da8cbebafc64e97026448c62d0ca592f1b1a7 +Author: Alice (ArtemenkoAY) +Date: Sun Mar 23 19:41:41 2025 +0300 + + code: Π²Ρ‹Π²ΠΎΠ΄ разности + +diff --git a/main.cpp b/main.cpp +index 1967dd8..f77bbcc 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'; ++ cout << "A - B = " << a - b << '\n'; + + } + +ΠŸΡ€ΠΎΡΠΌΠΎΡ‚Ρ€ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ + +ВнСсСм измСнСния Π² main.cpp: Π΄ΠΎΠ±Π°Π²ΠΈΠΌ ΠΏΠ΅Ρ‡Π°Ρ‚ΡŒ произвСдСния чисСл, Π½ΠΎ Π½Π΅ станСм ΠΏΠΎΠΊΠ° Π΄Π΅Π»Π°Ρ‚ΡŒ ΠΊΠΎΠΌΠΌΠΈΡ‚. +ΠŸΡ€ΠΎΡΠΌΠΎΡ‚Ρ€ΠΈΠΌ измСнСния Π² Ρ€Π°Π±ΠΎΡ‡Π΅ΠΉ ΠΊΠΎΠΏΠΈΠΈ: +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (main) +$ git diff +diff --git a/main.cpp b/main.cpp +index f77bbcc..8d75565 100644 +--- a/main.cpp ++++ b/main.cpp +@@ -9,5 +9,5 @@ int main() + cin >> a >> b; + cout << "A + B = " << a + b << '\n'; + cout << "A - B = " << a - b << '\n'; +- ++ cout << "A * B = " << a * b << '\n'; + } + +1 строка - Ρ„Π°ΠΉΠ»Ρ‹, ΠΊΠΎΡ‚ΠΎΡ€Ρ‹Π΅ сравниваСт ΠΊΠΎΠΌΠ°Π½Π΄Π°: a/main.cpp (старая вСрсия Ρ„Π°ΠΉΠ»Π°) ΠΈ b/main.cpp (новая вСрсия Ρ„Π°ΠΉΠ»Π°). +2 строка - Ρ…ΡΡˆΠΈ старой ΠΈ Π½ΠΎΠ²ΠΎΠΉ вСрсий Ρ„Π°ΠΉΠ»Π°. +5 строка - Π² ΠΊΠ°ΠΊΠΈΡ… строках ΠΏΡ€ΠΎΠΈΠ·ΠΎΡˆΠ»ΠΈ измСнСния ΠΈ количСство строк Π² старом ΠΈ Π½ΠΎΠ²ΠΎΠΌ Ρ„Π°ΠΉΠ»Π°Ρ…. +6 - 10 строка - ΠΏΠΎΠΊΠ°Π·Ρ‹Π²Π°Π΅Ρ‚, Ρ‡Ρ‚ΠΎ измСнилось Π² строках, Ρ‡Ρ‚ΠΎ ΠΎΡΡ‚Π°Π»ΠΎΡΡŒ Ρ‚Π°ΠΊΠΈΠΌ ΠΆΠ΅. + +ИзмСнСния ΠΌΠ΅ΠΆΠ΄Ρƒ самым ΠΏΠ΅Ρ€Π²Ρ‹ΠΌ ΠΊΠΎΠΌΠΌΠΈΡ‚ΠΎΠΌ ΠΈ ΠΊΠΎΠΌΠΌΠΈΡ‚ΠΎΠΌ, Π΄ΠΎΠ±Π°Π²Π»ΡΡŽΡ‰ΠΈΠΌ Π²Ρ‹Π²ΠΎΠ΄ разности: +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (main) +$ git diff f4f7fa5d1bb021ac6732ce0ba0fd23d0b9cc0c01 149da8cbebafc64e97026448c62d0ca592f1b1a7 +diff --git a/main.cpp b/main.cpp +index b4392ec..f77bbcc 100644 +--- a/main.cpp ++++ b/main.cpp +@@ -4,6 +4,10 @@ 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'; ++ cout << "A - B = " << a - b << '\n'; ++ + } +diff --git a/project.cbp b/project.cbp +new file mode 100644 +index 0000000..c4697a9 +--- /dev/null ++++ b/project.cbp +@@ -0,0 +1,38 @@ + + +5. ΠžΡ‚ΠΊΠ°Ρ‚ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ + +Π—Π°ΠΊΠΎΠΌΠΌΠΈΡ‚ΠΈΠΌ измСнСния Π² Ρ€Π°Π±ΠΎΡ‡Π΅ΠΉ ΠΊΠΎΠΏΠΈΠΈ (Π²Ρ‹Π²ΠΎΠ΄ произвСдСния): + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (main) +$ git commit -m: 'code: Π²Ρ‹Π²ΠΎΠ΄ произвСдСния' +error: pathspec 'code: Π²Ρ‹Π²ΠΎΠ΄ произвСдСния' did not match any file(s) known to git + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (main) +$ git add main.cpp + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (main) +$ git commit -m 'code: Π²Ρ‹Π²ΠΎΠ΄ произвСдСния' +[main c05dcd7] code: Π²Ρ‹Π²ΠΎΠ΄ произвСдСния + 1 file changed, 1 insertion(+), 1 deletion(-) + +Вносим измСнСния Π² ΠΊΠΎΠ΄, Π° ΠΏΠΎΡ‚ΠΎΠΌ ΠΎΡ‚ΠΊΠ°Ρ‚Ρ‹Π²Π°Π΅ΠΌ ΠΈΡ… Π΄ΠΎ состояния Π² ΠΎΠΏΡ€Π΅Π΄Π΅Π»Π΅Π½Π½ΠΎΠΌ ΠΊΠΎΠΌΠΌΠΈΡ‚Π΅ с ΠΏΠΎΠΌΠΎΡ‰ΡŒΡŽ ΠΊΠΎΠΌΠ°Π½Π΄Ρ‹ git reset: + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (main) +$ git reset --hard HEAD~1 +HEAD is now at c03016f git: ΠΈΠ³Π½ΠΎΡ€ΠΈΡ€ΠΎΠ²Π°Π½ΠΈΠ΅ Ρ„Π°ΠΉΠ»ΠΎΠ² +Π”ΠΎΠ±Π°Π²ΠΈΠΌ Π½Π°Π΄ Ρ„ΡƒΠ½ΠΊΡ†ΠΈΠ΅ΠΉ main() ΠΊΠΎΠΌΠΌΠ΅Π½Ρ‚Π°Ρ€ΠΈΠΉ: +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (main) +$ # you may type whatever you want + +Π£Π±Π΅Ρ€Π΅ΠΌ измСнСния Π² main.cpp Π΄Ρ€ΡƒΠ³ΠΈΠΌ способом β€” ΠΎΡ‚ΠΊΠ°Ρ‚ΠΈΠ² этот Ρ„Π°ΠΉΠ» ΠΊ ΡΠΎΡΡ‚ΠΎΡΠ½ΠΈΡŽ Π² послСднСм ΠΊΠΎΠΌΠΌΠΈΡ‚Π΅ (HEAD): + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (main) +$ git checkout HEAD -- main.cpp + +6. ОбмСн ΠΊΠΎΠ΄ΠΎΠΌ Ρ‡Π΅Ρ€Π΅Π· ΡƒΠ΄Π°Π»Π΅Π½Π½ΠΎΠ΅ Ρ…Ρ€Π°Π½ΠΈΠ»ΠΈΡ‰Π΅ +ОбмСн ΠΊΠΎΠ΄ΠΎΠΌ Ρ‡Π΅Ρ€Π΅Π· ΡƒΠ΄Π°Π»Ρ‘Π½Π½ΠΎΠ΅ Ρ…Ρ€Π°Π½ΠΈΠ»ΠΈΡ‰Π΅. Для Π·Π°Π³Ρ€ΡƒΠ·ΠΊΠΈ Π΄Π°Π½Π½Ρ‹Ρ… Π² Ρ€Π΅ΠΏΠΎΠ·ΠΈΡ‚Π°Ρ€ΠΈΠΉ GitHub Π±ΡƒΠ΄Π΅Ρ‚ ΠΈΡΠΏΠΎΠ»ΡŒΠ·ΠΎΠ²Π°Ρ‚ΡŒΡΡ ΠΏΡ€ΠΎΡ‚ΠΎΠΊΠΎΠ» SSH. ΠŸΠΎΡΡ‚ΠΎΠΌΡƒ для ΠΎΠ±ΠΌΠ΅Π½Π° Π΄Π°Π½Π½Ρ‹ΠΌΠΈ с сСрвСром Π½ΡƒΠΆΠ½ΠΎ ΡΠ³Π΅Π½Π΅Ρ€ΠΈΡ€ΠΎΠ²Π°Ρ‚ΡŒ ΠΏΠ°Ρ€Ρƒ ΠΈΠ· ΠΎΡ‚ΠΊΡ€Ρ‹Ρ‚ΠΎΠ³ΠΎ ΠΈ Π·Π°ΠΊΡ€Ρ‹Ρ‚ΠΎΠ³ΠΎ ΠΊΠ»ΡŽΡ‡Π΅ΠΉ. +user@WIN-0E2RN91IREF 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): 1234 +Enter passphrase for "1234" (empty for no passphrase): +Enter same passphrase again: +Your identification has been saved in 1234 +Your public key has been saved in 1234.pub +The key fingerprint is: +SHA256:TrF57TZXY8hnZk7BsMnOVdyMwMMX/7CO42xABSLAn1E user@WIN-0E2RN91IREF +The key's randomart image is: ++--[ED25519 256]--+ +| .....E .+.o.=o| +| . .. . * B.=| +| . o. . *.+.| +| o +..+ ooo| +| S.. .=.Oo| +| o ... oO..| +| . .* o. | +| +.+ | +| .o | ++----[SHA256]-----+ + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (main) +$ eval $(ssh-agent -s) +Agent pid 1632 + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (main) +$ ssh-add + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (main) +$ ssh-add 1234 +Enter passphrase for 1234: +Identity added: 1234 (user@WIN-0E2RN91IREF) + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (main) +$ cat 1234.pub +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJsfdrIXpoRC8oz8Yb0nvDW/14kGjNtiaxVJW+gq2zje user@WIN-0E2RN91IREF + +Π”ΠΎΠ±Π°Π²ΠΈΠΌ Ρ€Π΅ΠΏΠΎΠ·ΠΈΡ‚Π°Ρ€ΠΈΠΉ Π½Π° ΠΊΠΎΡ‚ΠΎΡ€Ρ‹ΠΉ Π±ΡƒΠ΄Π΅ΠΌ Π·Π°Π³Ρ€ΡƒΠΆΠ°Ρ‚ΡŒ Ρ…Ρ€Π°Π½ΠΈΠ»ΠΈΡ‰Π΅ git, ΠΈ Π·Π°Π³Ρ€ΡƒΠ·ΠΈΠΌ Ρ…Ρ€Π°Π½ΠΈΠ»ΠΈΡ‰Π΅ git Π½Π° GitHub с ΠΏΠΎΠΌΠΎΡ‰ΡŒΡŽ ΠΊΠΎΠΌΠ°Π½Π΄Ρ‹ git push: + + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (main) +$ git remote set-url origin http://uit.mpei.ru/git/ArtemenkoAY/cs-lab02.git + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (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: use of unencrypted HTTP remote URLs is not recommended; see https://aka.ms/gcm/unsaferemotes 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: 15, done. +Counting objects: 100% (15/15), done. +Delta compression using up to 4 threads +Compressing objects: 100% (13/13), done. +Writing objects: 100% (15/15), 2.00 KiB | 146.00 KiB/s, done. +Total 15 (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/ArtemenkoAY/cs-lab02.git + * [new branch] main -> main +branch 'main' set up to track 'origin/main'. + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (main) +$ git remote -v +origin http://uit.mpei.ru/git/ArtemenkoAY/cs-lab02.git (fetch) +origin http://uit.mpei.ru/git/ArtemenkoAY/cs-lab02.git (push) + +ΠŸΠΎΠ»ΡƒΡ‡Π΅Π½ΠΈΠ΅ ΠΏΡ€ΠΎΠ΅ΠΊΡ‚Π° с сСрвСра +ΠŸΡ€Π΅Π΄ΠΏΠΎΠ»ΠΎΠΆΠΈΠΌ, ΠΊ Ρ€Π°Π·Ρ€Π°Π±ΠΎΡ‚ΠΊΠ΅ ΠΏΡ€ΠΎΠ΅ΠΊΡ‚Π° присоСдиняСтся Π‘ΠΎΠ±. ΠžΡ‚ΠΊΡ€ΠΎΠ΅ΠΌ Ρ€Π°Π±ΠΎΡ‡ΡƒΡŽ копию с ΠΌΠ°ΡˆΠΈΠ½Ρ‹ Π‘ΠΎΠ±Π°: + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/bob +$ git clone http://uit.mpei.ru/git/ArtemenkoAY/cs-lab02.git project +Cloning into 'project'... +remote: Enumerating objects: 15, done. +remote: Counting objects: 100% (15/15), done. +remote: Compressing objects: 100% (13/13), done. +remote: Total 15 (delta 1), reused 0 (delta 0), pack-reused 0 +Receiving objects: 100% (15/15), done. +Resolving deltas: 100% (1/1), done. + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/bob +$ cd project + +Настроим Ρ…Ρ€Π°Π½ΠΈΠ»ΠΈΡ‰Π΅ Π‘ΠΎΠ±Π°: + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/bob/project (main) +$ git config user.name 'Bob (ArtemenkoAY)' + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/bob/project (main) +$ git config user.email 'ArtemenkoAYI@mpei.ru' + +7. БовмСстная Ρ€Π°Π±ΠΎΡ‚Π° Π½Π°Π΄ ΠΏΡ€ΠΎΠ΅ΠΊΡ‚ΠΎΠΌ Π±Π΅Π· ΠΊΠΎΠ½Ρ„Π»ΠΈΠΊΡ‚ΠΎΠ² ΠΏΡ€Π°Π²ΠΎΠΊ +Π‘ΠΎΠ± добавляСт Π½ΠΎΠ²Ρ‹ΠΉ ΠΊΠΎΠΌΠΌΠΈΡ‚, ΠΎΠΏΠ΅Ρ€Π΅ΠΆΠ°ΡŽΡ‰ΠΈΠΉ Π²Π΅Ρ€ΡΠΈΡŽ Π½Π° сСрвСрС, ΠΈ Π·Π°Π³Ρ€ΡƒΠΆΠ°Π΅Ρ‚ Π΅Π³ΠΎ Π½Π° GitHub. +«На машинС Π‘ΠΎΠ±Π°Β» добавляСм Π² ΠΏΡ€ΠΎΠ³Ρ€Π°ΠΌΠΌΡƒ ΠΏΠ΅Ρ‡Π°Ρ‚ΡŒ произвСдСния чисСл ΠΈ Π΄Π΅Π»Π°Π΅ΠΌ ΠΊΠΎΠΌΠΌΠΈΡ‚: + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/bob/project (main) +$ git add main.cpp + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/bob/project (main) +$ git commit -m 'code: Π²Ρ‹Π²ΠΎΠ΄ произвСдСния' +[main 98cdbca] code: Π²Ρ‹Π²ΠΎΠ΄ произвСдСния + 1 file changed, 1 insertion(+) + +ΠžΡ‚ΠΏΡ€Π°Π²Π»ΡΠ΅ΠΌ ΠΊΠΎΠΌΠΌΠΈΡ‚ Π½Π° сСрвСр: + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/bob/project (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 4 threads +Compressing objects: 100% (3/3), done. +Writing objects: 100% (3/3), 420 bytes | 140.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/ArtemenkoAY/cs-lab02.git + c03016f..98cdbca main -> main + +«На машинС Алисы» (Ρ‚ΠΎ Π΅ΡΡ‚ΡŒ Π² ΠΏΠ΅Ρ€Π²ΠΎΠΌ Ρ‚Π΅Ρ€ΠΌΠΈΠ½Π°Π»Π΅, Π² ΠΊΠ°Ρ‚Π°Π»ΠΎΠ³Π΅ alice/project) Π²Ρ‹ΠΏΠΎΠ»Π½ΠΈΡ‚Π΅ Π·Π°Π³Ρ€ΡƒΠ·ΠΊΡƒ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ: + +user@WIN-0E2RN91IREF 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), 400 bytes | 14.00 KiB/s, done. +From http://uit.mpei.ru/git/ArtemenkoAY/cs-lab02 + c03016f..98cdbca main -> origin/main + +УбСдимся, Ρ‡Ρ‚ΠΎ Π² Ρ€Π°Π±ΠΎΡ‡Π΅ΠΉ ΠΊΠΎΠΏΠΈΠΈ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ Π΅Ρ‰Π΅ Π½Π΅ ΠΏΡ€ΠΎΠΈΠ·ΠΎΡˆΠ»ΠΎ. +Для этого посмотрим ΠΈΡΡ‚ΠΎΡ€ΠΈΡŽ всСх Π²Π΅Ρ‚ΠΎΠΊ: +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (main) +$ git log --oneline --decorate --all --graph +* 98cdbca (origin/main, origin/HEAD) code: Π²Ρ‹Π²ΠΎΠ΄ произвСдСния +* c03016f (HEAD -> main) git: ΠΈΠ³Π½ΠΎΡ€ΠΈΡ€ΠΎΠ²Π°Π½ΠΈΠ΅ Ρ„Π°ΠΉΠ»ΠΎΠ² +* 149da8c code: Π²Ρ‹Π²ΠΎΠ΄ разности +* 13bafc2 code: Π²Ρ‹Π²ΠΎΠ΄ суммы +* 6ee4e6b build: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Ρ„Π°ΠΉΠ» ΠΏΡ€ΠΎΠ΅ΠΊΡ‚Π° +* f4f7fa5 code: Π·Π°Π³ΠΎΡ‚ΠΎΠ²ΠΊΠ° ΠΏΡ€ΠΎΠ³Ρ€Π°ΠΌΠΌΡ‹ + +Как ΠΌΠΎΠΆΠ½ΠΎ Π²ΠΈΠ΄Π΅Ρ‚ΡŒ, Π²Π΅Ρ‚ΠΊΠ° main отстаСт Π½Π° ΠΎΠ΄ΠΈΠ½ ΠΊΠΎΠΌΠΌΠΈΡ‚ ΠΎΡ‚ Π²Π΅Ρ‚ΠΊΠΈ origin/main. ΠŸΡ€ΠΎΠ΄Π²ΠΈΠ½Π΅ΠΌ Π²Π΅Ρ‚ΠΊΡƒ main ΠΊ скачанной вСрсии: + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (main) +$ git pull --ff-only +Updating c03016f..98cdbca +Fast-forward + main.cpp | 1 + + 1 file changed, 1 insertion(+) +Β«ΠžΡ‚ ΠΈΠΌΠ΅Π½ΠΈ Алисы» добавляСм Π² ΠΏΡ€ΠΎΠ³Ρ€Π°ΠΌΠΌΡƒ ΠΏΠ΅Ρ‡Π°Ρ‚ΡŒ дСлСния, Π° послС ΠΊΠΎΠΌΠΌΠΈΡ‚: + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (main) +$ git add main.cpp + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (main) +$ git commit -m 'code: Π²Ρ‹Π²ΠΎΠ΄ дСлСния' +[main 103f0b2] code: Π²Ρ‹Π²ΠΎΠ΄ дСлСния + 1 file changed, 1 insertion(+), 1 deletion(-) + +Π—Π°Π³Ρ€ΡƒΠΆΠ°Π΅ΠΌ измСнСния Π½Π° сСрвСр: + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (main) +$ git push +Enumerating objects: 5, done. +Counting objects: 100% (5/5), done. +Delta compression using up to 4 threads +Compressing objects: 100% (3/3), done. +Writing objects: 100% (3/3), 401 bytes | 401.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/ArtemenkoAY/cs-lab02.git + 98cdbca..103f0b2 main -> main + +И ΠΏΠΎΠ»ΡƒΡ‡Π°Π΅ΠΌ Π½ΠΎΠ²ΡƒΡŽ Π²Π΅Ρ€ΡΠΈΡŽ Β«Π½Π° машинС Π‘ΠΎΠ±Π°Β»: + +user@WIN-0E2RN91IREF MINGW64 ~/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), 381 bytes | 6.00 KiB/s, done. +From http://uit.mpei.ru/git/ArtemenkoAY/cs-lab02 + 98cdbca..103f0b2 main -> origin/main + +Π’Π΅Ρ‚ΠΊΠ° main, ΠΊΠ°ΠΊ ΠΌΡ‹ Π·Π½Π°Π΅ΠΌ, отстаСт Π½Π° ΠΎΠ΄ΠΈΠ½ ΠΊΠΎΠΌΠΌΠΈΡ‚ ΠΎΡ‚ Π²Π΅Ρ‚ΠΊΠΈ origin/main. ΠŸΡ€ΠΎΠ΄Π²ΠΈΠ½Π΅ΠΌ Π²Π΅Ρ‚ΠΊΡƒ main ΠΊ скачанной вСрсии: + + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/bob/project (main) +$ git pull --ff-only +Updating 98cdbca..103f0b2 +Fast-forward + main.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +8. Π Π°Π·Ρ€Π΅ΡˆΠ΅Π½ΠΈΠ΅ ΠΊΠΎΠ½Ρ„Π»ΠΈΠΊΡ‚ΠΎΠ² ΠΏΡ€Π°Π²ΠΎΠΊ ΠΏΡ€ΠΈ совмСстной Ρ€Π°Π±ΠΎΡ‚Π΅ +Π”Π°Π»Π΅Π΅, Алиса Ρ€Π΅ΡˆΠ°Π΅Ρ‚ Π΄ΠΎΠ±Π°Π²ΠΈΡ‚ΡŒ Π² ΠΏΡ€ΠΎΠ³Ρ€Π°ΠΌΠΌΡƒ ΠΏΠ΅Ρ‡Π°Ρ‚ΡŒ максимума ΠΈΠ· чисСл, Π° Π‘ΠΎΠ± β€” ΠΌΠΈΠ½ΠΈΠΌΡƒΠΌΠ°. +ΠžΡ‚ Π»ΠΈΡ†Π° Алисы, добавляСм ΠΏΠ΅Ρ‡Π°Ρ‚ΡŒ максимума: + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (main) +$ git add main.cpp + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (main) +$ git commit -m 'code: Π²Ρ‹Π²ΠΎΠ΄ максимума' +[main d777285] code: Π²Ρ‹Π²ΠΎΠ΄ максимума + 1 file changed, 1 insertion(+) + +Π—Π°Π³Ρ€ΡƒΠΆΠ°Π΅ΠΌ измСнСния Π½Π° сСрвСр ΠΎΡ‚ Π»ΠΈΡ†Π° Алисы: +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (main) +$ git push +Enumerating objects: 5, done. +Counting objects: 100% (5/5), done. +Delta compression using up to 4 threads +Compressing objects: 100% (3/3), done. +Writing objects: 100% (3/3), 409 bytes | 204.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/ArtemenkoAY/cs-lab02.git + 103f0b2..d777285 main -> main + +ΠžΡ‚ Π»ΠΈΡ†Π° Π‘ΠΎΠ±, добавляСм ΠΏΠ΅Ρ‡Π°Ρ‚ΡŒ ΠΌΠΈΠ½ΠΈΠΌΡƒΠΌΠ°: +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/bob/project (main) +$ git add main.cpp + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/bob/project (main) +$ git commit -m 'code: Π²Ρ‹Π²ΠΎΠ΄ ΠΌΠΈΠ½ΠΈΠΌΡƒΠΌΠ°' +[main d84e249] code: Π²Ρ‹Π²ΠΎΠ΄ ΠΌΠΈΠ½ΠΈΠΌΡƒΠΌΠ° + 1 file changed, 1 insertion(+) + + +Π—Π°Π³Ρ€ΡƒΠΆΠ°Π΅ΠΌ измСнСния Π½Π° сСрвСр ΠΎΡ‚ Π»ΠΈΡ†Π° Π‘ΠΎΠ±Π°: + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/bob/project (main) +$ git push +To http://uit.mpei.ru/git/ArtemenkoAY/cs-lab02.git + ! [rejected] main -> main (fetch first) +error: failed to push some refs to 'http://uit.mpei.ru/git/ArtemenkoAY/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. + + +Однако Π·Π°Π³Ρ€ΡƒΠ·ΠΈΡ‚ΡŒ Π½Π° сСрвСр измСнСния получаСтся Ρ‚ΠΎΠ»ΡŒΠΊΠΎ Ρƒ Алисы ΠΏΠΎΡ‚ΠΎΠΌΡƒ, Ρ‡Ρ‚ΠΎ Π‘ΠΎΠ± Π·Π°Ρ‚Π΅ΠΌ пытаСтся Π·Π°Π³Ρ€ΡƒΠ·ΠΈΡ‚ΡŒ Π²Π΅Ρ€ΡΠΈΡŽ, ΠΎΡΠ½ΠΎΠ²Π°Π½Π½ΡƒΡŽ Π½Π° Π±ΠΎΠ»Π΅Π΅ старом ΠΊΠΎΠΌΠΌΠΈΡ‚Π΅, Ρ‡Π΅ΠΌ самый Π½ΠΎΠ²Ρ‹ΠΉ ΠΊΠΎΠΌΠΌΠΈΡ‚ Π² Ρ€Π΅ΠΏΠΎΠ·ΠΈΡ‚Π°Ρ€ΠΈΠΈ GitHub. +Π—Π°Π³Ρ€ΡƒΠ·ΠΈΠΌ Π²Π΅Ρ€ΡΠΈΡŽ с сСрвСра: + +user@WIN-0E2RN91IREF MINGW64 ~/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), 389 bytes | 7.00 KiB/s, done. +From http://uit.mpei.ru/git/ArtemenkoAY/cs-lab02 + 103f0b2..d777285 main -> origin/main + +МоТно Π²ΠΈΠ΄Π΅Ρ‚ΡŒ, Ρ‡Ρ‚ΠΎ Π²Π΅Ρ‚ΠΊΠ° main локального рСпозитария Ρ€Π°Π·ΠΎΡˆΠ»Π°ΡΡŒ с Π²Π΅Ρ‚ΠΊΠΎΠΉ origin/main, Ρ‚ΠΎ Π΅ΡΡ‚ΡŒ с Π²Π΅Ρ‚ΠΊΠΎΠΉ main Π½Π° сСрвСрС. + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/bob/project (main) +$ git log --oneline --decorate --all --graph +* d84e249 (HEAD -> main) code: Π²Ρ‹Π²ΠΎΠ΄ ΠΌΠΈΠ½ΠΈΠΌΡƒΠΌΠ° +| * d777285 (origin/main, origin/HEAD) code: Π²Ρ‹Π²ΠΎΠ΄ максимума +|/ +* 103f0b2 code: Π²Ρ‹Π²ΠΎΠ΄ дСлСния +* 98cdbca code: Π²Ρ‹Π²ΠΎΠ΄ произвСдСния +* c03016f git: ΠΈΠ³Π½ΠΎΡ€ΠΈΡ€ΠΎΠ²Π°Π½ΠΈΠ΅ Ρ„Π°ΠΉΠ»ΠΎΠ² +* 149da8c code: Π²Ρ‹Π²ΠΎΠ΄ разности +* 13bafc2 code: Π²Ρ‹Π²Π΄ суммы +* 6ee4e6b build: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Ρ„Π°ΠΉΠ» ΠΏΡ€ΠΎΠ΅ΠΊΡ‚Π° +* f4f7fa5 code: Π·Π°Π³ΠΎΡ‚ΠΎΠ²ΠΊΠ° ΠΏΡ€ΠΎΠ³Ρ€Π°ΠΌΠΌΡ‹ + +Π‘ΠΎΠ±Ρƒ Π½ΡƒΠΆΠ½ΠΎ ΠΏΠ΅Ρ€Π΅ΠΌΠ΅ΡΡ‚ΠΈΡ‚ΡŒ свой ΠΊΠΎΠΌΠΌΠΈΡ‚ ΠΏΠΎΠ²Π΅Ρ€Ρ… ΠΊΠΎΠΌΠΌΠΈΡ‚Π° Алисы, Ρ‚ΠΎ Π΅ΡΡ‚ΡŒ ΠΏΠΎΠ²Π΅Ρ€Ρ… origin/main: + + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/bob/project (main) +$ git rebase origin/main +Auto-merging main.cpp +CONFLICT (content): Merge conflict in main.cpp +error: could not apply d84e249... 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 d84e249... code: Π²Ρ‹Π²ΠΎΠ΄ ΠΌΠΈΠ½ΠΈΠΌΡƒΠΌΠ° + +Комманда Π·Π°Π²Π΅Ρ€ΡˆΠ°Π΅Ρ‚ΡΡ с ошибкой ΠΈΠ·-Π·Π° ΠΊΠΎΠ½Ρ„Π»ΠΈΠΊΡ‚Π° Π² Ρ„Π°ΠΉΠ»Π΅ с ΠΊΠΎΠ΄ΠΎΠΌ main.cpp. ΠŸΡ€ΠΎΠΈΠ·Π²ΠΎΠ΄Π½Ρ‹ΠΉ Ρ„Π°ΠΉΠ» ΠΎΡ‚ Ρ„Π°ΠΉΠ»Π° Алисы ΠΈ Π‘ΠΎΠ±Π° записываСтся Π² Ρ€Π°Π±ΠΎΡ‡ΡƒΡŽ копию с ΠΏΠΎΠΌΠ΅Ρ‡Π΅Π½Π½Ρ‹ΠΌΠΈ ΠΌΠ΅Ρ‚ΠΊΠ°ΠΌΠΈ ΠΊΠΎΠ½Ρ„Π»ΠΈΠΊΡ‚Π°. Π£Π±ΠΈΡ€Π°Π΅ΠΌ ΠΌΠ΅Ρ‚ΠΊΠΈ ΠΊΠΎΠ½Ρ„Π»ΠΈΠΊΡ‚Π°, ΠΈ Π΄ΠΎΡ€Π°Π±Π°Ρ‚Ρ‹Π²Π°Π΅ΠΌ ΠΊΠΎΠ΄ Ρ‚Π°ΠΊ, Ρ‡Ρ‚ΠΎΠ±Ρ‹ ΠΏΡ€ΠΎΠ³Ρ€Π°ΠΌΠΌΠ° ΠΊΠΎΠΌΠΏΠΈΠ»ΠΈΡ€ΠΎΠ²Π°Π»Π°ΡΡŒ ΠΈ Ρ€Π°Π±ΠΎΡ‚Π°Π»Π°. Π—Π°Ρ‚Π΅ΠΌ Π·Π°Π³Ρ€ΡƒΠΆΠ°Π΅ΠΌ измСнСния Π² индСкс ΠΈ ΠΏΡ€ΠΎΠ΄ΠΎΠ»ΠΆΠ°Π΅ΠΌ ΠΎΠΏΠ΅Ρ€Π°Ρ†ΠΈΡŽ git rebase, с ΠΏΠΎΠΌΠΎΡ‰ΡŒΡŽ Ρ„Π»Π°Π³Π° –continue. + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/bob/project (main|REBASE 1/1) +$ git add main.cpp + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/bob/project (main|REBASE 1/1) +$ git rebase --continue +hint: Waiting for your editor to close the file... +(electron) Sending uncompressed crash reports is deprecated and will be removed in a future version of Electron. Set { compress: true } to opt-in to the new behavior. Crash reports will be uploaded gzipped, which most crash reporting servers support. +(node:12404) electron: The default of contextIsolation is deprecated and will be changing from false to true in a future release of Electron. See https://github.com/electron/electron/issues/23506 for more information +(node:2328) Electron: Loading non-context-aware native module in renderer: '\\?\C:\Users\user\AppData\Local\atom\app-1.63.1\resources\app.asar.unpacked\node_modules\superstring\build\Release\superstring.node'. This is deprecated, see https://github.com/electron/electron/issues/18397. +(node:2328) Electron: Loading non-context-aware native module in renderer: '\\?\C:\Users\user\AppData\Local\atom\app-1.63.1\resources\app.asar.unpacked\node_modules\pathwatcher\build\Release\pathwatcher.node'. This is deprecated, see https://github.com/electron/electron/issues/18397. +(node:2328) Electron: Loading non-context-aware native module in renderer: '\\?\C:\Users\user\AppData\Local\atom\app-1.63.1\resources\app.asar.unpacked\node_modules\oniguruma\build\Release\onig_scanner.node'. This is deprecated, see https://github.com/electron/electron/issues/18397. +(node:2328) Electron: Loading non-context-aware native module in renderer: '\\?\C:\Users\user\AppData\Local\atom\app-1.63.1\resources\app.asar.unpacked\node_modules\tree-sitter-c\build\Release\tree_sitter_c_binding.node'. This is deprecated, see https://github.com/electron/electron/issues/18397. +(node:2328) Electron: Loading non-context-aware native module in renderer: '\\?\C:\Users\user\AppData\Local\atom\app-1.63.1\resources\app.asar.unpacked\node_modules\tree-sitter-cpp\build\Release\tree_sitter_cpp_binding.node'. This is deprecated, see https://github.com/electron/electron/issues/18397. +(node:2328) Electron: Loading non-context-aware native module in renderer: '\\?\C:\Users\user\AppData\Local\atom\app-1.63.1\resources\app.asar.unpacked\node_modules\tree-sitter-css\build\Release\tree_sitter_css_binding.node'. This is deprecated, see https://github.com/electron/electron/issues/18397. +(node:2328) Electron: Loading non-context-aware native module in renderer: '\\?\C:\Users\user\AppData\Local\atom\app-1.63.1\resources\app.asar.unpacked\node_modules\tree-sitter-go\build\Release\tree_sitter_go_binding.node'. This is deprecated, see https://github.com/electron/electron/issues/18397. +(node:2328) Electron: Loading non-context-aware native module in renderer: '\\?\C:\Users\user\AppData\Local\atom\app-1.63.1\resources\app.asar.unpacked\node_modules\tree-sitter-embedded-template\build\Release\tree_sitter_embedded_template_binding.node'. This is deprecated, see https://github.com/electron/electron/issues/18397. +(node:2328) Electron: Loading non-context-aware native module in renderer: '\\?\C:\Users\user\AppData\Local\atom\app-1.63.1\resources\app.asar.unpacked\node_modules\tree-sitter-html\build\Release\tree_sitter_html_binding.node'. This is deprecated, see https://github.com/electron/electron/issues/18397. +(node:2328) Electron: Loading non-context-aware native module in renderer: '\\?\C:\Users\user\AppData\Local\atom\app-1.63.1\resources\app.asar.unpacked\node_modules\tree-sitter-java-dev\build\Release\tree_sitter_java_binding.node'. This is deprecated, see https://github.com/electron/electron/issues/18397. +(node:2328) Electron: Loading non-context-aware native module in renderer: '\\?\C:\Users\user\AppData\Local\atom\app-1.63.1\resources\app.asar.unpacked\node_modules\tree-sitter-javascript\build\Release\tree_sitter_javascript_binding.node'. This is deprecated, see https://github.com/electron/electron/issues/18397. +(node:2328) Electron: Loading non-context-aware native module in renderer: '\\?\C:\Users\user\AppData\Local\atom\app-1.63.1\resources\app.asar.unpacked\node_modules\tree-sitter-jsdoc\build\Release\tree_sitter_jsdoc_binding.node'. This is deprecated, see https://github.com/electron/electron/issues/18397. +(node:2328) Electron: Loading non-context-aware native module in renderer: '\\?\C:\Users\user\AppData\Local\atom\app-1.63.1\resources\app.asar.unpacked\node_modules\tree-sitter-regex\build\Release\tree_sitter_regex_binding.node'. This is deprecated, see https://github.com/electron/electron/issues/18397. +(node:2328) Electron: Loading non-context-aware native module in renderer: '\\?\C:\Users\user\AppData\Local\atom\app-1.63.1\resources\app.asar.unpacked\node_modules\tree-sitter-json\build\Release\tree_sitter_json_binding.node'. This is deprecated, see https://github.com/electron/electron/issues/18397. +(node:2328) Electron: Loading non-context-aware native module in renderer: '\\?\C:\Users\user\AppData\Local\atom\app-1.63.1\resources\app.asar.unpacked\node_modules\tree-sitter-python\build\Release\tree_sitter_python_binding.node'. This is deprecated, see https://github.com/electron/electron/issues/18397. +(node:2328) Electron: Loading non-context-aware native module in renderer: '\\?\C:\Users\user\AppData\Local\atom\app-1.63.1\resources\app.asar.unpacked\node_modules\tree-sitter-ruby\build\Release\tree_sitter_ruby_binding.node'. This is deprecated, see https://github.com/electron/electron/issues/18397. +(node:2328) Electron: Loading non-context-aware native module in renderer: '\\?\C:\Users\user\AppData\Local\atom\app-1.63.1\resources\app.asar.unpacked\node_modules\tree-sitter-rust\build\Release\tree_sitter_rust_binding.node'. This is deprecated, see https://github.com/electron/electron/issues/18397. +(node:2328) Electron: Loading non-context-aware native module in renderer: '\\?\C:\Users\user\AppData\Local\atom\app-1.63.1\resources\app.asar.unpacked\node_modules\tree-sitter-bash\build\Release\tree_sitter_bash_binding.node'. This is deprecated, see https://github.com/electron/electron/issues/18397. +(node:2328) Electron: Loading non-context-aware native module in renderer: '\\?\C:\Users\user\AppData\Local\atom\app-1.63.1\resources\app.asar.unpacked\node_modules\tree-sitter-typescript\build\Release\tree_sitter_tsx_binding.node'. This is deprecated, see https://github.com/electron/electron/issues/18397. +(node:2328) Electron: Loading non-context-aware native module in renderer: '\\?\C:\Users\user\AppData\Local\atom\app-1.63.1\resources\app.asar.unpacked\node_modules\tree-sitter-typescript\build\Release\tree_sitter_typescript_binding.node'. This is deprecated, see https://github.com/electron/electron/issues/18397. +(node:12404) electron: The default of contextIsolation is deprecated and will be changing from false to true in a future release of Electron. See https://github.com/electron/electron/issues/23506 for more information +(node:2328) Electron: Loading non-context-aware native module in renderer: '\\?\C:\Users\user\AppData\Local\atom\app-1.63.1\resources\app.asar.unpacked\node_modules\spellchecker\build\Release\spellchecker.node'. This is deprecated, see https://github.com/electron/electron/issues/18397. +(node:2328) Electron: Loading non-context-aware native module in renderer: '\\?\C:\Users\user\AppData\Local\atom\app-1.63.1\resources\app.asar.unpacked\node_modules\git-utils\build\Release\git.node'. This is deprecated, see https://github.com/electron/electron/issues/18397. +(node:2328) Electron: Loading non-context-aware native module in renderer: '\\?\C:\Users\user\AppData\Local\atom\app-1.63.1\resources\app.asar.unpacked\node_modules\@atom\nsfw\build\Release\nsfw.node'. This is deprecated, see https://github.com/electron/electron/issues/18397. +Attempting to call a function in a renderer window that has been closed or released. +Function provided here: Object. (C:\Users\user\AppData\Local\atom\app-1.63.1\resources\app.asar\node_modules\github\lib\worker.js:64:22 +Remote event names: crashed, destroyed +[detached HEAD 92cf582] code: Π²Ρ‹Π²ΠΎΠ΄ ΠΌΠΈΠ½ΠΈΠΌΡƒΠΌΠ° + 1 file changed, 2 insertions(+) +Successfully rebased and updated refs/heads/main. + +ΠžΡ‚ΠΏΡ€Π°Π²ΠΈΠΌ измСнСния Π½Π° сСрвСр: + + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/bob/project (main) +$ git push +Enumerating objects: 5, done. +Counting objects: 100% (5/5), done. +Delta compression using up to 4 threads +Compressing objects: 100% (3/3), done. +Writing objects: 100% (3/3), 416 bytes | 208.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/ArtemenkoAY/cs-lab02.git + d777285..92cf582 main -> main + + + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/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), 396 bytes | 7.00 KiB/s, done. +From http://uit.mpei.ru/git/ArtemenkoAY/cs-lab02 + d777285..92cf582 main -> origin/main +Updating d777285..92cf582 +Fast-forward + main.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (main) +$ git log +commit 92cf5822e746a681143206a7f8ca57857507fb73 (HEAD -> main, origin/main, origin/HEAD) +Author: Bob (ArtemenkoAY) +Date: Mon Mar 24 16:11:57 2025 +0300 + + code: Π²Ρ‹Π²ΠΎΠ΄ ΠΌΠΈΠ½ΠΈΠΌΡƒΠΌΠ° + +commit d7772852e578b47185b4140824dc02cfa8744c3c +Author: Alice (ArtemenkoAY) +Date: Mon Mar 24 16:07:07 2025 +0300 + + code: Π²Ρ‹Π²ΠΎΠ΄ максимума + +commit 103f0b2532c5cfefe97a5bdd8e6bf13957204757 +Author: Alice (ArtemenkoAY) +Date: Mon Mar 24 13:38:56 2025 +0300 + + code: Π²Ρ‹Π²ΠΎΠ΄ дСлСния + +commit 98cdbca4cd7bdfbd5795c326962db6de9e775736 +Author: Bob (ArtemenkoAY) +Date: Mon Mar 24 13:25:54 2025 +0300 + + +ΠŸΠΎΠ»ΡƒΡ‡ΠΈΠ»ΠΈ ΠΆΠ΅Π»Π°Π΅ΠΌΡ‹ΠΉ Ρ€Π΅Π·ΡƒΠ»ΡŒΡ‚Π°Ρ‚. +9. ИспользованиС Π²Π΅Ρ‚ΠΎΠΊ +Пока Π‘ΠΎΠ± синхронизируСт измСнСния, Алиса мСняСт Ρ†Π΅Π»Ρ‹Π΅ числа Π½Π° Π΄Π΅ΠΉΡΡ‚Π²ΠΈΡ‚Π΅Π»ΡŒΠ½Ρ‹Π΅, для этого создадим ΠΎΡ‚Π΄Π΅Π»ΡŒΠ½ΡƒΡŽ Π²Π΅Ρ‚ΠΊΡƒ double Ρ‚.ΠΊ. это ΠΌΠΎΠΆΠ΅Ρ‚ Π·Π°Π½ΡΡ‚ΡŒ врСмя. +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (main) +$ git branch double + +ΠŸΠ΅Ρ€Π΅ΠΊΠ»ΡŽΡ‡Π°ΡŽΡΡŒ с Π²Π΅Ρ‚ΠΊΠΈ main Π½Π° Π²Π΅Ρ‚ΠΊΡƒ double: + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (main) +$ git checkout double +Switched to branch 'double' + +МСняСм Ρ‚ΠΈΠΏ Π΄Π°Π½Π½Ρ‹Ρ… ΠΈ ΠΊΠΎΠΌΠΌΠΈΡ‚ΠΈΠΌ измСнСния Π² Ρ„Π°ΠΉΠ»Π΅: + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (double) +$ git add main.cpp + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (double) +$ git commit -m 'code: ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠ΅ Ρ‚ΠΈΠΏΠ° Π΄Π°Π½Π½Ρ‹Ρ…' +[double 44e5418] code: ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠ΅ Ρ‚ΠΈΠΏΠ° Π΄Π°Π½Π½Ρ‹Ρ… + 1 file changed, 1 insertion(+), 1 deletion(-) + +ΠžΠ±Ρ€Π°Ρ‚Π½ΠΎ ΠΏΠ΅Ρ€Π΅ΠΊΠ»ΡŽΡ‡Π°Π΅ΠΌΡΡ Π½Π° Π²Π΅Ρ‚ΠΊΡƒ main: + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (double) +$ git checkout main +Switched to branch 'main' +Your branch is up to date with 'origin/main'. + +Π‘ΠΈΠ½Ρ…Ρ€ΠΎΠ½ΠΈΠ·ΠΈΡ€ΡƒΠ΅ΠΌ Π²Π΅Ρ‚ΠΊΡƒ main: + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (main) +$ git fetch +ΠŸΠΎΠ»ΡƒΡ‡Π°Π΅ΠΌ ΠΎΠ΄Π½ΠΎΠ²Ρ€Π΅ΠΌΠ΅Π½Π½ΠΎ Π΄Π²Π΅ Π²Π΅Ρ‚ΠΊΠΈ: + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (main) +$ git log --oneline --decorate --all --graph +* 44e5418 (double) code: ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠ΅ Ρ‚ΠΈΠΏΠ° Π΄Π°Π½Π½Ρ‹Ρ… +* 92cf582 (HEAD -> main, origin/main, origin/HEAD) code: Π²Ρ‹Π²ΠΎΠ΄ ΠΌΠΈΠ½ΠΈΠΌΡƒΠΌΠ° +* d777285 code: Π²Ρ‹Π²ΠΎΠ΄ максимума +* 103f0b2 code: Π²Ρ‹Π²ΠΎΠ΄ дСлСния +* 98cdbca code: Π²Ρ‹Π²ΠΎΠ΄ произвСдСния +* c03016f git: ΠΈΠ³Π½ΠΎΡ€ΠΈΡ€ΠΎΠ²Π°Π½ΠΈΠ΅ Ρ„Π°ΠΉΠ»ΠΎΠ² +* 149da8c code: Π²Ρ‹Π²ΠΎΠ΄ разности +* 13bafc2 code: Π²Ρ‹Π²ΠΎΠ΄ суммы +* 6ee4e6b build: Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ Ρ„Π°ΠΉΠ» ΠΏΡ€ΠΎΠ΅ΠΊΡ‚Π° +* f4f7fa5 code: Π·Π°Π³ΠΎΡ‚ΠΎΠ²ΠΊΠ° ΠΏΡ€ΠΎΠ³Ρ€Π°ΠΌΠΌΡ‹ + + +ОбъСдиняСм Π²Π΅Ρ‚ΠΊΠΈ double ΠΈ main. Вносим послСдниС измСнСния ΠΈ Π·Π°Π³Ρ€ΡƒΠΆΠ°Π΅ΠΌ Π½Π° GitHub. + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (main) +$ git merge double +Updating 92cf582..44e5418 +Fast-forward + main.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +user@WIN-0E2RN91IREF MINGW64 ~/Desktop/lab02/alice/project (main) +$ git push +Enumerating objects: 5, done. +Counting objects: 100% (5/5), done. +Delta compression using up to 4 threads +Compressing objects: 100% (3/3), done. +Writing objects: 100% (3/3), 396 bytes | 198.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/ArtemenkoAY/cs-lab02.git + 92cf582..44e5418 main -> main + +