User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02

$ ls



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02

$ mkdir alice



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02

$ mkdir bob



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02

$ cd alice



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice

$ mkdir project



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice

$ cd project



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project

$ cd ..



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice

$ cd project



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project

$ git init

Initialized empty Git repository in C:/Users/User/Desktop/lab02/alice/project/.git/



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (master)

$ git branch -m main



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (main)

$ ls -A

.git/



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (main)

$ git config user.name 'Alice (FadeevIS)'



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (main)

$ git config user.email 'FadeevIS@mpei.ru'



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (main)

$ git status

On branch main



No commits yet



Untracked files:

  (use "git add <file>..." to include in what will be committed)

        main.cpp

        project.cbp



nothing added to commit but untracked files present (use "git add" to track)



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (main)

$ git add main.cpp



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (main)

$ git status

On branch main



No commits yet



Changes to be committed:

  (use "git rm --cached <file>..." to unstage)

        new file:   main.cpp



Untracked files:

  (use "git add <file>..." to include in what will be committed)

        project.cbp





User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (main)

$ git commit -m 'code: заготовка программы'

[main (root-commit) 758f7d7] code: заготовка программы

 1 file changed, 9 insertions(+)

 create mode 100644 main.cpp



User@▒▒▒▒▒▒▒▒▒ 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@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (main)

$ git commit -m 'build: добавлен файл проекта'

[main 2552572] build: добавлен файл проекта

 1 file changed, 40 insertions(+)

 create mode 100644 project.cbp



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (main)

$ git status

On branch main

Changes not staged for commit:

  (use "git add <file>..." to update what will be committed)

  (use "git restore <file>..." to discard changes in working directory)

        modified:   main.cpp



Untracked files:

  (use "git add <file>..." to include in what will be committed)

        bin/

        obj/



no changes added to commit (use "git add" and/or "git commit -a")



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (main)

$ git status

On branch main

Changes not staged for commit:

  (use "git add <file>..." to update what will be committed)

  (use "git restore <file>..." to discard changes in working directory)

        modified:   main.cpp



Untracked files:

  (use "git add <file>..." to include in what will be committed)

        .gitignore

        obj/



no changes added to commit (use "git add" and/or "git commit -a")



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (main)

$ git status

On branch main

Changes not staged for commit:

  (use "git add <file>..." to update what will be committed)

  (use "git restore <file>..." to discard changes in working directory)

        modified:   main.cpp



Untracked files:

  (use "git add <file>..." to include in what will be committed)

        .gitignore

        project.depend



no changes added to commit (use "git add" and/or "git commit -a")



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (main)

$ git status

On branch main

Changes not staged for commit:

  (use "git add <file>..." to update what will be committed)

  (use "git restore <file>..." to discard changes in working directory)

        modified:   main.cpp



Untracked files:

  (use "git add <file>..." to include in what will be committed)

        .gitignore

        project.depend



no changes added to commit (use "git add" and/or "git commit -a")



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (main)

$ git add .gitignore



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (main)

$ git commit -m 'git: Скрыты продукты сборки'

[main 1d8c303] git: Скрыты продукты сборки

 1 file changed, 3 insertions(+)

 create mode 100644 .gitignore



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (main)

$ git log

commit 1d8c30368d03836466478b5279399848d9e1feda (HEAD -> main)

Author: Alice (FadeevIS) <FadeevIS@mpei.ru>

Date:   Sat Apr 1 13:02:38 2023 +0300



    git: Скрыты продукты сборки



commit 255257244a85dd469f2e26d0b0f9e71815738d3d

Author: Alice (FadeevIS) <FadeevIS@mpei.ru>

Date:   Sat Apr 1 12:37:35 2023 +0300



    build: добавлен файл проекта



commit 758f7d7a754e41da5f7bb275f5511b9c037b7c9b

Author: Alice (FadeevIS) <FadeevIS@mpei.ru>

Date:   Sat Apr 1 12:35:46 2023 +0300



    code: заготовка программы



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (main)

$ git log --start

fatal: unrecognized argument: --start



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (main)

$ git log --stat

commit 1d8c30368d03836466478b5279399848d9e1feda (HEAD -> main)

Author: Alice (FadeevIS) <FadeevIS@mpei.ru>

Date:   Sat Apr 1 13:02:38 2023 +0300



    git: Скрыты продукты сборки



 .gitignore | 3 +++

 1 file changed, 3 insertions(+)



commit 255257244a85dd469f2e26d0b0f9e71815738d3d

Author: Alice (FadeevIS) <FadeevIS@mpei.ru>

Date:   Sat Apr 1 12:37:35 2023 +0300



    build: добавлен файл проекта



 project.cbp | 40 ++++++++++++++++++++++++++++++++++++++++

 1 file changed, 40 insertions(+)



commit 758f7d7a754e41da5f7bb275f5511b9c037b7c9b

Author: Alice (FadeevIS) <FadeevIS@mpei.ru>

Date:   Sat Apr 1 12:35:46 2023 +0300



    code: заготовка программы



 main.cpp | 9 +++++++++

 1 file changed, 9 insertions(+)



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (main)

$ git log --oneline --decorate

1d8c303 (HEAD -> main) git: Скрыты продукты сборки

2552572 build: добавлен файл проекта

758f7d7 code: заготовка программы



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (main)

$ git log --oneline --decorate --all --graph

* 1d8c303 (HEAD -> main) git: Скрыты продукты сборки

* 2552572 build: добавлен файл проекта

* 758f7d7 code: заготовка программы



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (main)

$ git log --grep 'build'

commit 255257244a85dd469f2e26d0b0f9e71815738d3d

Author: Alice (FadeevIS) <FadeevIS@mpei.ru>

Date:   Sat Apr 1 12:37:35 2023 +0300



    build: добавлен файл проекта



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (main)

$ git log --project.cbp

fatal: unrecognized argument: --project.cbp



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (main)

$ git log -- project.cbp

commit 255257244a85dd469f2e26d0b0f9e71815738d3d

Author: Alice (FadeevIS) <FadeevIS@mpei.ru>

Date:   Sat Apr 1 12:37:35 2023 +0300



    build: добавлен файл проекта



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (main)

$ git show HEAD~1

commit 255257244a85dd469f2e26d0b0f9e71815738d3d

Author: Alice (FadeevIS) <FadeevIS@mpei.ru>

Date:   Sat Apr 1 12:37:35 2023 +0300



    build: добавлен файл проекта



diff --git a/project.cbp b/project.cbp

new file mode 100644

index 0000000..99bb702

--- /dev/null

+++ b/project.cbp

@@ -0,0 +1,40 @@

+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>

+<CodeBlocks_project_file>

+       <FileVersion major="1" minor="6" />

+       <Project>

+               <Option title="project" />

+               <Option pch_mode="2" />

+               <Option compiler="gcc" />

+               <Build>

+                       <Target title="Debug">

+                               <Option output="bin/Debug/project" prefix_auto="1" extension_auto="1" />

+                               <Option object_output="obj/Debug/" />

+                               <Option type="1" />

+                               <Option compiler="gcc" />

+                               <Compiler>

+                                       <Add option="-g" />

+                               </Compiler>

+                       </Target>



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (main)

$ git status

On branch main

Changes not staged for commit:

  (use "git add <file>..." to update what will be committed)

  (use "git restore <file>..." to discard changes in working directory)

        modified:   main.cpp

        modified:   project.cbp



Untracked files:

  (use "git add <file>..." to include in what will be committed)

        project.depend



no changes added to commit (use "git add" and/or "git commit -a")



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (main)

$ git add main.cpp



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (main)

$ git commit -m 'code: Вывод суммы и разности'

[main 7fb959e] code: Вывод суммы и разности

 1 file changed, 5 insertions(+), 2 deletions(-)



User@▒▒▒▒▒▒▒▒▒ 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 fd75bba..cf347e8 100644

--- a/main.cpp

+++ b/main.cpp

@@ -8,5 +8,5 @@ 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 @@

                        <Add option="-Wall" />

                        <Add option="-fexceptions" />

                </Compiler>

+               <Unit filename=".gitignore" />

                <Unit filename="main.cpp" />

                <Extensions>

                        <lib_finder disable_auto="1" />



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (main)

$ git diff 758f7d7 HEAD

diff --git a/.gitignore b/.gitignore

new file mode 100644

index 0000000..d85abef

--- /dev/null

+++ b/.gitignore

@@ -0,0 +1,3 @@

+/bin

+/obj

+/*.layout

diff --git a/main.cpp b/main.cpp

index b4392ec..fd75bba 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



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (main)

$ git status

On branch main

Changes not staged for commit:

  (use "git add <file>..." to update what will be committed)

  (use "git restore <file>..." to discard changes in working directory)

        modified:   main.cpp

        modified:   project.cbp



Untracked files:

  (use "git add <file>..." to include in what will be committed)

        project.depend



no changes added to commit (use "git add" and/or "git commit -a")



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (main)

$ git add main.cpp



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (main)

$ git commit -m 'code: Вывод произведения'

[main 39e33cc] code: Вывод произведения

 1 file changed, 1 insertion(+), 1 deletion(-)



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (main)

$ git diff HEAD HEAD~1

diff --git a/main.cpp b/main.cpp

index cf347e8..fd75bba 100644

--- a/main.cpp

+++ b/main.cpp

@@ -8,5 +8,5 @@ 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';

 }



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (main)

$ git reset --hard HEAD~1

HEAD is now at 7fb959e code: Вывод суммы и разности



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (main)

$ git checkout HEAD -- main.cpp



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (main)

$ ssh-keygen

Generating public/private rsa key pair.

Enter file in which to save the key (/c/Users/User/.ssh/id_rsa):

/c/Users/User/.ssh/id_rsa 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_rsa

Your public key has been saved in /c/Users/User/.ssh/id_rsa.pub

The key fingerprint is:

SHA256:lbiTVT3+AJzXOLxLiQmMzXRnCplZwR+lXh6QDkAsk0U User@▒▒▒▒▒▒▒▒▒

The key's randomart image is:

+---[RSA 3072]----+

|        *E+B=*++.|

|       +.oO*==X..|

|        + +.+B.B.|

|         =  ooBo.|

|        S    ..+.|

|         .    . .|

|                 |

|                 |

|                 |

+----[SHA256]-----+



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (main)

$ eval $(ssh-agent -s)

Agent pid 2166



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (main)

$ ssh-add

Enter passphrase for /c/Users/User/.ssh/id_rsa:

Identity added: /c/Users/User/.ssh/id_rsa (User@▒▒▒▒▒▒▒▒▒)



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (main)

$ cat ~/.ssh/id_rsa.pub

ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDSQIXsxidd+ymRUEAOUnu6+/bBi1o7ix/wMxALwWzKL84UmtXMqoMcYS1hFKH/JlT0tB2rRrDu8jny9aZzRZM74LeWVwtpzQ2PQk8KH/VUqs1lp/gM8UyPok/jKX8NfH5gIi7Tj8yXiyzooiqBbfm/BKsR/9nd/DDXim9eRa505u7Wtnt5hw8ikFhpqErmA/ZZ0VOLRABOD8VJ/jx5CiUEzz8leDujlNN6dMNsf6kooERQV4MSuHoK7UhYNgFAzUGNoHtFLoEpnTXLniqc7o/OPq1A42fhE5an7J10Z9hOqY+u0+gosPKK6j7kDtWb3tOAxtBV0WL8yvSlEqjfZtZvVNt4LuYztgY3KeW+cALUnY4CXwZblGXiCXYqyWzbizQehXQ3s2KswSRbIyGibfIs4yPY4YvaQZWLRCt9jQghYwO9u8MtjXngk0Cgq1YB2lTLHvpKd7G1akCRYTtUZ5Te3dPpzGfDC31w7BsDL7V9zkki8KgDz0w1xY/emLvloG8= User@▒▒▒▒▒▒▒▒▒



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (main)

$ git remote add origin git@uit.mpei.ru:FadeevIS/cs-lab02n.git



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (main)

$ git push -u origin main

Enumerating objects: 12, done.

Counting objects: 100% (12/12), done.

Delta compression using up to 4 threads

Compressing objects: 100% (10/10), done.

Writing objects: 100% (12/12), 1.78 KiB | 363.00 KiB/s, done.

Total 12 (delta 0), reused 0 (delta 0), pack-reused 0

remote: . Processing 1 references

remote: Processed 1 references in total

To uit.mpei.ru:FadeevIS/cs-lab02n.git

 * [new branch]      main -> main

branch 'main' set up to track 'origin/main'.





BOB'S WORK

User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/bob

$ git clone git@uit.mpei.ru:FadeevIS/cs-lab02n.git project

Cloning into 'project'...

Enter passphrase for key '/c/Users/User/.ssh/id_rsa':

remote: Enumerating objects: 12, done.

remote: Counting objects: 100% (12/12), done.

remote: Compressing objects: 100% (10/10), done.

remote: Total 12 (delta 0), reused 0 (delta 0), pack-reused 0

Receiving objects: 100% (12/12), done.



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/bob

$ dir

project



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/bob

$ cd project



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/bob/project (main)

$ git config user.name 'Bob (FadeevIS)'



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/bob/project (main)

$ git config user.email 'FadeevIS@mpei.ru'



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/bob/project (main)

$ git add main.cpp



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/bob/project (main)

$ git commit -m 'code: Вывод произведения'

[main 523442a] code: Вывод произведения

 1 file changed, 1 insertion(+), 1 deletion(-)



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/bob/project (main)

$ git log -- main.cpp

commit 523442a62b40f4e76aa8e8d554e7ae37f7a6f82e (HEAD -> main)

Author: Bob (FadeevIS) <FadeevIS@mpei.ru>

Date:   Sat Apr 1 16:46:30 2023 +0300



    code: Вывод произведения



commit 7fb959eb0917b7609a8d9e96957dd4fbf67d9894 (origin/main, origin/HEAD)

Author: Alice (FadeevIS) <FadeevIS@mpei.ru>

Date:   Sat Apr 1 15:44:53 2023 +0300



    code: Вывод суммы и разности



commit 758f7d7a754e41da5f7bb275f5511b9c037b7c9b

Author: Alice (FadeevIS) <FadeevIS@mpei.ru>

Date:   Sat Apr 1 12:35:46 2023 +0300



    code: заготовка программы



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/bob/project (main)

$ git push

Enter passphrase for key '/c/Users/User/.ssh/id_rsa':

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), 408 bytes | 408.00 KiB/s, done.

Total 3 (delta 1), reused 0 (delta 0), pack-reused 0

remote: . Processing 1 references

remote: Processed 1 references in total

To uit.mpei.ru:FadeevIS/cs-lab02n.git

   7fb959e..523442a  main -> main



ALISE'S WORK

User@▒▒▒▒▒▒▒▒▒ 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), 388 bytes | 27.00 KiB/s, done.

From uit.mpei.ru:FadeevIS/cs-lab02n

   7fb959e..523442a  main       -> origin/main



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (main)

$ git log --oneline --decorate --all --graph

* 523442a (origin/main) code: Вывод произведения

* 7fb959e (HEAD -> main) code: Вывод суммы и разности

* 1d8c303 git: Скрыты продукты сборки

* 2552572 build: добавлен файл проекта

* 758f7d7 code: заготовка программы



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (main)

$ git pull --ff-only

Updating 7fb959e..523442a

Fast-forward

 main.cpp | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (main)

$ git sta

stage    stash    status



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (main)

$ git status

On branch main

Your branch is up to date with 'origin/main'.



Changes not staged for commit:

  (use "git add <file>..." to update what will be committed)

  (use "git restore <file>..." to discard changes in working directory)

        modified:   main.cpp



Untracked files:

  (use "git add <file>..." to include in what will be committed)

        project.depend



no changes added to commit (use "git add" and/or "git commit -a")



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (main)

$ git add main.cpp



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (main)

$ git commit -m 'code: Вывод частного'

[main cbd9a48] code: Вывод частного

 1 file changed, 1 insertion(+), 1 deletion(-)



User@▒▒▒▒▒▒▒▒▒ 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), 402 bytes | 402.00 KiB/s, done.

Total 3 (delta 1), reused 0 (delta 0), pack-reused 0

remote: . Processing 1 references

remote: Processed 1 references in total

To uit.mpei.ru:FadeevIS/cs-lab02n.git

   523442a..cbd9a48  main -> main



Разрешение конфликта



code: Вывод минимума



# Please enter the commit message for your changes. Lines starting

# with '#' will be ignored, and an empty message aborts the commit.

#

# interactive rebase in progress; onto 20f3add

# Last command done (1 command done):

#    pick 41a5714 code: Вывод минимума

# No commands remaining.

# You are currently rebasing branch 'main' on '20f3add'.

#

# Changes to be committed:

#       modified:   main.cpp

#

~

~

~

~

~

~

~

~

~

~

~

~

~

~



ALICE'SWORK (BRANCHES)



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (main)

$ ls

bin/  main.cpp  obj/  project.cbp  project.depend  project.layout



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (main)

$ git log --oneline --decorate --all --graph

* 20f3add (HEAD -> main, origin/main) code: Вывод максимума

* cbd9a48 code: Вывод частного

* 523442a code: Вывод произведения

* 7fb959e code: Вывод суммы и разности

* 1d8c303 git: Скрыты продукты сборки

* 2552572 build: добавлен файл проекта

* 758f7d7 code: заготовка программы



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (main)

$ git branch double



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (main)

$ git checkout double

Switched to branch 'double'



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (double)

$ git sta

stage    stash    status



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (double)

$ git status

On branch double

Changes not staged for commit:

  (use "git add <file>..." to update what will be committed)

  (use "git restore <file>..." to discard changes in working directory)

        modified:   main.cpp



Untracked files:

  (use "git add <file>..." to include in what will be committed)

        project.depend



no changes added to commit (use "git add" and/or "git commit -a")



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (double)

$ git add main.cpp



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (double)

$ git commit -m 'code: Дробные числа'

[double e5d158e] code: Дробные числа

 1 file changed, 1 insertion(+), 1 deletion(-)



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (double)

$ git checkout main

Switched to branch 'main'

Your branch is up to date with 'origin/main'.



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (main)

$ git fetch origin

Enter passphrase for key '/c/Users/User/.ssh/id_rsa':



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (main)

$ git log --oneline --decorate --all --graph

* e5d158e (double) code: Дробные числа

* 20f3add (HEAD -> main, origin/main) code: Вывод максимума

* cbd9a48 code: Вывод частного

* 523442a code: Вывод произведения

* 7fb959e code: Вывод суммы и разности

* 1d8c303 git: Скрыты продукты сборки

* 2552572 build: добавлен файл проекта

* 758f7d7 code: заготовка программы



User@▒▒▒▒▒▒▒▒▒ MINGW64 ~/Desktop/lab02/alice/project (main)

$ git merge double

Updating 20f3add..e5d158e

Fast-forward

 main.cpp | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)