user@MICHAELD032 CLANGARM64 / $ cd .. user@MICHAELD032 CLANGARM64 / $ cd .. user@MICHAELD032 CLANGARM64 / $ cd .. user@MICHAELD032 CLANGARM64 / $ cd LICENSE.txt dev/ mingw64/ unins000.exe ReleaseNotes.html etc/ proc/ unins000.msg bin/ git-bash.exe tmp/ usr/ cmd/ git-cmd.exe unins000.dat user@MICHAELD032 CLANGARM64 / $ cd .. user@MICHAELD032 CLANGARM64 / $ cd .. ~/source bash: cd: too many arguments user@MICHAELD032 CLANGARM64 / $ cd ~/source user@MICHAELD032 CLANGARM64 ~/source $ cd repos/ user@MICHAELD032 CLANGARM64 ~/source/repos $ cd lab02/ user@MICHAELD032 CLANGARM64 ~/source/repos/lab02 $ cd bob user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob $ git git clone git@uit.mpei.ru:SukhotinMD/cs-lab02.git project git: 'git' is not a git command. See 'git --help'. The most similar command is init user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob $ git clone git@uit.mpei.ru:SukhotinMD/cs-lab02.git project Cloning into 'project'... Enter passphrase for key '/c/Users/user/.ssh/id_ed25519': remote: Enumerating objects: 22, done. remote: Counting objects: 100% (22/22), done. remote: Compressing objects: 100% (13/13), done. remote: Total 22 (delta 3), reused 0 (delta 0), pack-reused 0 Receiving objects: 100% (22/22), done. Resolving deltas: 100% (3/3), done. user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob $ cd project/ user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main) $ git config.name('Bob (SukhotinMD)') bash: syntax error near unexpected token `(' user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main) $ git config.name 'Bob (SukhotinMD)' git: 'config.name' is not a git command. See 'git --help'. user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main) $ git config user.name 'Bob (SukhotinMD)' user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main) $ git config user.email 'SukhotinMD@mpei.ru' user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main) $ git status On branch main Your branch is up to date with 'origin/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: project/project.cpp Untracked files: (use "git add ..." to include in what will be committed) project/.vs/ no changes added to commit (use "git add" and/or "git commit -a") user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main) $ git add project/project.cpp user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main) $ git commit "code: Добавлено произведение Bob" error: pathspec 'code: Добавлено произведение Bob' did not match any file(s) known to git user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main) $ git commit -m "code: Добавлено произведение Bob" [main 62e345e] code: Добавлено произведение Bob 1 file changed, 2 insertions(+), 1 deletion(-) user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main) $ git push Enter passphrase for key '/c/Users/user/.ssh/id_ed25519': Enter passphrase for key '/c/Users/user/.ssh/id_ed25519': Enumerating objects: 7, done. Counting objects: 100% (7/7), done. Delta compression using up to 4 threads Compressing objects: 100% (3/3), done. Writing objects: 100% (4/4), 402 bytes | 201.00 KiB/s, done. Total 4 (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:SukhotinMD/cs-lab02.git 2917583..62e345e main -> main user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main) $ git fetch Enter passphrase for key '/c/Users/user/.ssh/id_ed25519': remote: Enumerating objects: 7, done. remote: Counting objects: 100% (7/7), done. remote: Compressing objects: 100% (3/3), done. remote: Total 4 (delta 2), reused 0 (delta 0), pack-reused 0 Unpacking objects: 100% (4/4), 371 bytes | 53.00 KiB/s, done. From uit.mpei.ru:SukhotinMD/cs-lab02 62e345e..44e7f89 main -> origin/main user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main) $ git status On branch main Your branch is behind 'origin/main' by 1 commit, and can be fast-forwarded. (use "git pull" to update your local branch) Untracked files: (use "git add ..." to include in what will be committed) project/.vs/ nothing added to commit but untracked files present (use "git add" to track) user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main) $ git log --oneline --graph --decorate * 62e345e (HEAD -> main) code: Добавлено произведение Bob * 2917583 build: Внесение файла проекта под git * 2b3d2ab build: gitignore * 0fd5b86 code: Сумма и разность по заготовке * 9568ca1 code: Добавлена вывод суммы в код * 478e763 code: Добавление кода из описания лабы * 6bb59ae code: заготовка программы user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main) $ git fetch Enter passphrase for key '/c/Users/user/.ssh/id_ed25519': Enter passphrase for key '/c/Users/user/.ssh/id_ed25519': user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main) $ git log --oneline --graph --decorate * 62e345e (HEAD -> main) code: Добавлено произведение Bob * 2917583 build: Внесение файла проекта под git * 2b3d2ab build: gitignore * 0fd5b86 code: Сумма и разность по заготовке * 9568ca1 code: Добавлена вывод суммы в код * 478e763 code: Добавление кода из описания лабы * 6bb59ae code: заготовка программы user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main) $ git fetch Enter passphrase for key '/c/Users/user/.ssh/id_ed25519': user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main) $ git log --oneline --graph --decorate * 62e345e (HEAD -> main) code: Добавлено произведение Bob * 2917583 build: Внесение файла проекта под git * 2b3d2ab build: gitignore * 0fd5b86 code: Сумма и разность по заготовке * 9568ca1 code: Добавлена вывод суммы в код * 478e763 code: Добавление кода из описания лабы * 6bb59ae code: заготовка программы user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main) $ git branch * main user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main) $ git fetch Enter passphrase for key '/c/Users/user/.ssh/id_ed25519': Enter passphrase for key '/c/Users/user/.ssh/id_ed25519': user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main) $ git log --oneline --graph --decorate * 62e345e (HEAD -> main) code: Добавлено произведение Bob * 2917583 build: Внесение файла проекта под git * 2b3d2ab build: gitignore * 0fd5b86 code: Сумма и разность по заготовке * 9568ca1 code: Добавлена вывод суммы в код * 478e763 code: Добавление кода из описания лабы * 6bb59ae code: заготовка программы user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main) $ git show 44e7f89 commit 44e7f89676892fee76ba7810cefb00878c4b3c26 (origin/main, origin/HEAD) Author: Alice (SukhotinMD) Date: Mon Mar 24 15:57:36 2025 +0300 code: Добавлено деление diff --git a/project/project.cpp b/project/project.cpp index e9ac1c7..0672f4f 100644 --- a/project/project.cpp +++ b/project/project.cpp @@ -11,7 +11,8 @@ int main() cin >> a >> b; cout << "A + B = " << a + b << '\n' << "A - B = " << a - b << '\n' - << "A * B = " << a * b << '\n'; + << "A * B = " << a * b << '\n' + << "A / B = " << a / b << '\n'; user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main) $ git log --oneline --graph --decorate --all * 44e7f89 (origin/main, origin/HEAD) code: Добавлено деление * 62e345e (HEAD -> main) code: Добавлено произведение Bob * 2917583 build: Внесение файла проекта под git * 2b3d2ab build: gitignore * 0fd5b86 code: Сумма и разность по заготовке * 9568ca1 code: Добавлена вывод суммы в код * 478e763 code: Добавление кода из описания лабы * 6bb59ae code: заготовка программы user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main) $ git pull --ff-only Enter passphrase for key '/c/Users/user/.ssh/id_ed25519': Updating 62e345e..44e7f89 Fast-forward project/project.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main) $ git log --oneline --graph --decorate --all * 44e7f89 (HEAD -> main, origin/main, origin/HEAD) code: Добавлено деление * 62e345e code: Добавлено произведение Bob * 2917583 build: Внесение файла проекта под git * 2b3d2ab build: gitignore * 0fd5b86 code: Сумма и разность по заготовке * 9568ca1 code: Добавлена вывод суммы в код * 478e763 code: Добавление кода из описания лабы * 6bb59ae code: заготовка программы user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main) $ git status On branch main Your branch is up to date with 'origin/main'. Untracked files: (use "git add ..." to include in what will be committed) project/.vs/ nothing added to commit but untracked files present (use "git add" to track) user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main) $ git status On branch main Your branch is up to date with 'origin/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: project/project.cpp Untracked files: (use "git add ..." to include in what will be committed) .vs/ project/.vs/ no changes added to commit (use "git add" and/or "git commit -a") user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main) $ git add project/project.cpp user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main) $ git commit -m "code: Конфликт min Bob" [main 3fd2d34] code: Конфликт min Bob 1 file changed, 1 insertion(+) user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main) $ git push Enter passphrase for key '/c/Users/user/.ssh/id_ed25519': To uit.mpei.ru:SukhotinMD/cs-lab02.git ! [rejected] main -> main (fetch first) error: failed to push some refs to 'uit.mpei.ru:SukhotinMD/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. user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main) $ git pull Enter passphrase for key '/c/Users/user/.ssh/id_ed25519': remote: Enumerating objects: 7, done. remote: Counting objects: 100% (7/7), done. remote: Compressing objects: 100% (3/3), done. remote: Total 4 (delta 2), reused 0 (delta 0), pack-reused 0 Unpacking objects: 100% (4/4), 378 bytes | 34.00 KiB/s, done. From uit.mpei.ru:SukhotinMD/cs-lab02 44e7f89..1b2b2d6 main -> origin/main Auto-merging project/project.cpp CONFLICT (content): Merge conflict in project/project.cpp Automatic merge failed; fix conflicts and then commit the result. user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main|MERGING) $ git log --oneline --decorate --all --graph * 3fd2d34 (HEAD -> main) code: Конфликт min Bob | * 1b2b2d6 (origin/main, origin/HEAD) code: Конфликт max Alice |/ * 44e7f89 code: Добавлено деление * 62e345e code: Добавлено произведение Bob * 2917583 build: Внесение файла проекта под git * 2b3d2ab build: gitignore * 0fd5b86 code: Сумма и разность по заготовке * 9568ca1 code: Добавлена вывод суммы в код * 478e763 code: Добавление кода из описания лабы * 6bb59ae code: заготовка программы //Разрешение конфликтов правок при совместной работе user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main|MERGING) $ git rebase origin/main project/project.cpp: needs merge error: cannot rebase: You have unstaged changes. error: additionally, your index contains uncommitted changes. error: Please commit or stash them. user@MICHAELD032 CLANGARM64 ~/source/repos/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: project/project.cpp Untracked files: (use "git add ..." to include in what will be committed) .vs/ project/.vs/ no changes added to commit (use "git add" and/or "git commit -a") user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main|MERGING) $ git add project/project.cpp user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main|MERGING) $ git rebase --continue fatal: no rebase in progress user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main|MERGING) $ git rebase orogin/main fatal: invalid upstream 'orogin/main' user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main|MERGING) $ git rebase origin/main error: cannot rebase: Your index contains uncommitted changes. error: Please commit or stash them. user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main|MERGING) $ git commit -m "code: Конфликт 2 min max Bob" [main e280498] code: Конфликт 2 min max Bob user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main) $ git rebase origin/main Auto-merging project/project.cpp CONFLICT (content): Merge conflict in project/project.cpp error: could not apply 3fd2d34... code: Конфликт min Bob 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 3fd2d34... code: Конфликт min Bob user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main|REBASE 1/1) $ git rebase --continue project/project.cpp: needs merge You must edit all merge conflicts and then mark them as resolved using git add user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main|REBASE 1/1) $ git status interactive rebase in progress; onto 1b2b2d6 Last command done (1 command done): pick 3fd2d34 code: Конфликт min Bob [detached HEAD fbecc7c] code: Конфликт min Bob 1 file changed, 4 insertions(+), 1 deletion(-) Successfully rebased and updated refs/heads/main. user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main) $ git log --oneline --graph --all --decorate * fbecc7c (HEAD -> main) code: Конфликт min Bob * 1b2b2d6 (origin/main, origin/HEAD) code: Конфликт max Alice * 44e7f89 code: Добавлено деление * 62e345e code: Добавлено произведение Bob * 2917583 build: Внесение файла проекта под git * 2b3d2ab build: gitignore * 0fd5b86 code: Сумма и разность по заготовке * 9568ca1 code: Добавлена вывод суммы в код * 478e763 code: Добавление кода из описания лабы * 6bb59ae code: заготовка программы user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main) $ git push Enter passphrase for key '/c/Users/user/.ssh/id_ed25519': Enter passphrase for key '/c/Users/user/.ssh/id_ed25519': Enumerating objects: 7, done. Counting objects: 100% (7/7), done. Delta compression using up to 4 threads Compressing objects: 100% (3/3), done. Writing objects: 100% (4/4), 405 bytes | 405.00 KiB/s, done. Total 4 (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:SukhotinMD/cs-lab02.git 1b2b2d6..fbecc7c main -> main user@MICHAELD032 CLANGARM64 ~/source/repos/lab02/bob/project (main) $