u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob $ git clone git@uit.mpei.ru:KonovalovaAlA/cs-lab02 project Cloning into 'project'... Enter passphrase for key '/c/Users/u111-09/.ssh/id_rsa': remote: Enumerating objects: 12, done. remote: Counting objects: 100% (12/12), done. remote: Compressing objects: 100% (11/11), done. remote: Total 12 (delta 1), reused 0 (delta 0), pack-reused 0 Receiving objects: 100% (12/12), done. Resolving deltas: 100% (1/1), done. u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob $ u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob $ cd project u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master) $ git config usage: git config [] Config file location --global use global config file --system use system config file --local use repository config file --worktree use per-worktree config file -f, --file use given config file --blob read config from given blob object Action --get get value: name [value-regex] --get-all get all values: key [value-regex] --get-regexp get values for regexp: name-regex [value-regex] --get-urlmatch get value specific for the URL: section[.var] URL --replace-all replace all matching variables: name value [value_regex] --add add a new variable: name value --unset remove a variable: name [value-regex] --unset-all remove all matches: name [value-regex] --rename-section rename section: old-name new-name --remove-section remove a section: name -l, --list list all -e, --edit open an editor --get-color find the color configured: slot [default] --get-colorbool find the color setting: slot [stdout-is-tty] Type -t, --type <> value is given this type --bool value is "true" or "false" --int value is decimal number --bool-or-int value is --bool or --int --path value is a path (file or directory name) --expiry-date value is an expiry date Other -z, --null terminate values with NUL byte --name-only show variable names only --includes respect include directives on lookup --show-origin show origin of config (file, standard input, blob, command line) --default with --get, use default value when missing entry u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master) $ git commit -m 'code: вывод произведения' On branch master Your branch is up to date with 'origin/master'. nothing to commit, working tree clean u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master) $ git add main.cpp u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master) $ git commit -m 'code: вывод произведения' On branch master Your branch is up to date with 'origin/master'. nothing to commit, working tree clean u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master) $ git commit -m 'code: вывод произведения' On branch master Your branch is up to date with 'origin/master'. nothing to commit, working tree clean u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master) $ git log commit ea9094fd2f1ced3bbce27b5e15ad28d4b8b3d34c (HEAD -> master, origin/master, origin/HEAD) Author: Alice (KonovalovaAA) Date: Mon Mar 13 14:38:38 2023 +0300 code: вывод разности commit f02e56655a5149c1d19cfafe2e8014b19127461e Author: Alice (KonovalovaAA) Date: Mon Mar 13 14:34:56 2023 +0300 code: вывод суммы commit 1b4a85a93e714b9992e12a78bee0d6993febb6f6 Author: Alice (KonovalovaAA) Date: Mon Mar 13 14:22:51 2023 +0300 build: add project file commit 375569df6965d47ed0e9b34b7b78a7f613970111 Author: Alice (KonovalovaAA) Date: Mon Mar 13 14:19:53 2023 +0300 u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master) $ git add -u u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master) $ git commit -m 'code: вывод произведения' On branch master Your branch is up to date with 'origin/master'. nothing to commit, working tree clean u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master) $ git add -u u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master) $ git commit -m 'code: вывод произведения' [master 58189b1] code: вывод произведения Committer: u111-09 Your name and email address were configured automatically based on your username and hostname. Please check that they are accurate. You can suppress this message by setting them explicitly. Run the following command and follow the instructions in your editor to edit your configuration file: git config --global --edit After doing this, you may fix the identity used for this commit with: git commit --amend --reset-author 1 file changed, 2 insertions(+), 1 deletion(-) u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master) $ git push Enter passphrase for key '/c/Users/u111-09/.ssh/id_rsa': Enumerating objects: 5, done. Counting objects: 100% (5/5), done. Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 365 bytes | 182.00 KiB/s, done. Total 3 (delta 1), reused 0 (delta 0) remote: . Processing 1 references remote: Processed 1 references in total To uit.mpei.ru:KonovalovaAlA/cs-lab02 ea9094f..58189b1 master -> master u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master) $ git pull Enter passphrase for key '/c/Users/u111-09/.ssh/id_rsa': 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), done. From uit.mpei.ru:KonovalovaAlA/cs-lab02 58189b1..37f4089 master -> origin/master Updating 58189b1..37f4089 Fast-forward main.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master) $ git log commit 37f408941ff6633c95761a56189c9a0629f4afc5 (HEAD -> master, origin/master, origin/HEAD) Author: Alice (KonovalovaAA) Date: Mon Mar 13 16:29:56 2023 +0300 code: вывод деления commit 58189b1c70b56677668e485167bad74ed7c29559 Author: u111-09 Date: Mon Mar 13 16:15:12 2023 +0300 code: вывод произведения commit ea9094fd2f1ced3bbce27b5e15ad28d4b8b3d34c Author: Alice (KonovalovaAA) Date: Mon Mar 13 14:38:38 2023 +0300 code: вывод разности commit f02e56655a5149c1d19cfafe2e8014b19127461e Author: Alice (KonovalovaAA) Date: Mon Mar 13 14:34:56 2023 +0300 u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master) $ git add -u u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master) $ git commit -m 'code: вывод минимума' [master efb07d3] code: вывод минимума Committer: u111-09 Your name and email address were configured automatically based on your username and hostname. Please check that they are accurate. You can suppress this message by setting them explicitly. Run the following command and follow the instructions in your editor to edit your configuration file: git config --global --edit After doing this, you may fix the identity used for this commit with: git commit --amend --reset-author 1 file changed, 5 insertions(+), 1 deletion(-) u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master) $ git push Enter passphrase for key '/c/Users/u111-09/.ssh/id_rsa': To uit.mpei.ru:KonovalovaAlA/cs-lab02 ! [rejected] master -> master (fetch first) error: failed to push some refs to 'git@uit.mpei.ru:KonovalovaAlA/cs-lab02' hint: Updates were rejected because the remote contains work that you do hint: not have locally. This is usually caused by another repository pushing hint: to the same ref. You may want to first integrate the remote changes hint: (e.g., 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master) $ git pull Enter passphrase for key '/c/Users/u111-09/.ssh/id_rsa': 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), done. From uit.mpei.ru:KonovalovaAlA/cs-lab02 37f4089..4e1efcf master -> origin/master Auto-merging main.cpp CONFLICT (content): Merge conflict in main.cpp Automatic merge failed; fix conflicts and then commit the result. u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master|MERGING) $ git log commit efb07d32c5825786c5b8c39b2d7f687c03083d3b (HEAD -> master) Author: u111-09 Date: Mon Mar 13 16:49:15 2023 +0300 code: вывод минимума commit 37f408941ff6633c95761a56189c9a0629f4afc5 Author: Alice (KonovalovaAA) Date: Mon Mar 13 16:29:56 2023 +0300 code: вывод деления commit 58189b1c70b56677668e485167bad74ed7c29559 Author: u111-09 Date: Mon Mar 13 16:15:12 2023 +0300 code: вывод произведения commit ea9094fd2f1ced3bbce27b5e15ad28d4b8b3d34c Author: Alice (KonovalovaAA) Date: Mon Mar 13 14:38:38 2023 +0300 code: вывод разности u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master|MERGING) $ git pull error: Pulling is not possible because you have unmerged files. hint: Fix them up in the work tree, and then use 'git add/rm ' hint: as appropriate to mark resolution and make a commit. fatal: Exiting because of an unresolved conflict. u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master|MERGING) $ git log --decorate --oneline efb07d3 (HEAD -> master) code: вывод минимума 37f4089 code: вывод деления 58189b1 code: вывод произведения ea9094f code: вывод разности f02e566 code: вывод суммы 1b4a85a build: add project file 375569d code: заготовка программы u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master|MERGING) $ git pull error: Pulling is not possible because you have unmerged files. hint: Fix them up in the work tree, and then use 'git add/rm ' hint: as appropriate to mark resolution and make a commit. fatal: Exiting because of an unresolved conflict. u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master|MERGING) $ git add -u u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master|MERGING) $ git add -u u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master|MERGING) $ git commit -m 'code: вывод минимума' [master a4852ff] code: вывод минимума Committer: u111-09 Your name and email address were configured automatically based on your username and hostname. Please check that they are accurate. You can suppress this message by setting them explicitly. Run the following command and follow the instructions in your editor to edit your configuration file: git config --global --edit After doing this, you may fix the identity used for this commit with: git commit --amend --reset-author u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master) $ git pull Enter passphrase for key '/c/Users/u111-09/.ssh/id_rsa': Already up to date. u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master) $ git log --decorate --oneline a4852ff (HEAD -> master) code: вывод минимума efb07d3 code: вывод минимума 4e1efcf (origin/master, origin/HEAD) code: вывод максимума 37f4089 code: вывод деления 58189b1 code: вывод произведения ea9094f code: вывод разности f02e566 code: вывод суммы 1b4a85a build: add project file 375569d code: заготовка программы u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master) $ git reset --hard efb07d3 HEAD is now at efb07d3 code: вывод минимума u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master) $ git log --decorate --oneline efb07d3 (HEAD -> master) code: вывод минимума 37f4089 code: вывод деления 58189b1 code: вывод произведения ea9094f code: вывод разности f02e566 code: вывод суммы 1b4a85a build: add project file 375569d code: заготовка программы u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master) $ git reset --hard 37f4089 HEAD is now at 37f4089 code: вывод деления u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master) $ git log --decorate --oneline 37f4089 (HEAD -> master) code: вывод деления 58189b1 code: вывод произведения ea9094f code: вывод разности f02e566 code: вывод суммы 1b4a85a build: add project file 375569d code: заготовка программы u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master) $ git pull Enter passphrase for key '/c/Users/u111-09/.ssh/id_rsa': Updating 37f4089..4e1efcf Fast-forward main.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master) $ git log --decorate --oneline 4e1efcf (HEAD -> master, origin/master, origin/HEAD) code: вывод максимума 37f4089 code: вывод деления 58189b1 code: вывод произведения ea9094f code: вывод разности f02e566 code: вывод суммы 1b4a85a build: add project file 375569d code: заготовка программы u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master) $ git add -u u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master) $ git commit -m 'code: вывод минимума' On branch master Your branch is up to date with 'origin/master'. nothing to commit, working tree clean u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master) $ git log --decorate --oneline 4e1efcf (HEAD -> master, origin/master, origin/HEAD) code: вывод максимума 37f4089 code: вывод деления 58189b1 code: вывод произведения ea9094f code: вывод разности f02e566 code: вывод суммы 1b4a85a build: add project file 375569d code: заготовка программы u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master) $ git reset --hard 37f4089 HEAD is now at 37f4089 code: вывод деления u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master) $ git log --decorate --oneline 37f4089 (HEAD -> master) code: вывод деления 58189b1 code: вывод произведения ea9094f code: вывод разности f02e566 code: вывод суммы 1b4a85a build: add project file 375569d code: заготовка программы u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master) $ git add -u u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master) $ git commit -m 'code: вывод минимума' On branch master Your branch is behind 'origin/master' by 1 commit, and can be fast-forwarded. (use "git pull" to update your local branch) nothing to commit, working tree clean u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master) $ git log --decorate --oneline 37f4089 (HEAD -> master) code: вывод деления 58189b1 code: вывод произведения ea9094f code: вывод разности f02e566 code: вывод суммы 1b4a85a build: add project file 375569d code: заготовка программы u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master) $ git add -u u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master) $ git commit -m 'code: вывод минимума' On branch master Your branch is behind 'origin/master' by 1 commit, and can be fast-forwarded. (use "git pull" to update your local branch) nothing to commit, working tree clean u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master) $ git pull Enter passphrase for key '/c/Users/u111-09/.ssh/id_rsa': Updating 37f4089..4e1efcf Fast-forward main.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master) $ git log --decorate --oneline 4e1efcf (HEAD -> master, origin/master, origin/HEAD) code: вывод максимума 37f4089 code: вывод деления 58189b1 code: вывод произведения ea9094f code: вывод разности f02e566 code: вывод суммы 1b4a85a build: add project file 375569d code: заготовка программы u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master) $ git add -u u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master) $ git commit -m 'code: вывод минимума' On branch master Your branch is up to date with 'origin/master'. nothing to commit, working tree clean u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master) $ git rebase origin/master Current branch master is up to date. u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master) $ git log --decorate --oneline 4e1efcf (HEAD -> master, origin/master, origin/HEAD) code: вывод максимума 37f4089 code: вывод деления 58189b1 code: вывод произведения ea9094f code: вывод разности f02e566 code: вывод суммы 1b4a85a build: add project file 375569d code: заготовка программы u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master) $ git add -u u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master) $ git commit -m 'code: вывод минимума' [master f0a1776] code: вывод минимума Committer: u111-09 Your name and email address were configured automatically based on your username and hostname. Please check that they are accurate. You can suppress this message by setting them explicitly. Run the following command and follow the instructions in your editor to edit your configuration file: git config --global --edit After doing this, you may fix the identity used for this commit with: git commit --amend --reset-author 1 file changed, 2 insertions(+), 1 deletion(-) u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master) $ git rebase origin/master Current branch master is up to date. u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master) $ git log --decorate --oneline f0a1776 (HEAD -> master) code: вывод минимума 4e1efcf (origin/master, origin/HEAD) code: вывод максимума 37f4089 code: вывод деления 58189b1 code: вывод произведения ea9094f code: вывод разности f02e566 code: вывод суммы 1b4a85a build: add project file 375569d code: заготовка программы u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master) $ git push Enter passphrase for key '/c/Users/u111-09/.ssh/id_rsa': Enumerating objects: 5, done. Counting objects: 100% (5/5), done. Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 356 bytes | 356.00 KiB/s, done. Total 3 (delta 1), reused 0 (delta 0) remote: . Processing 1 references remote: Processed 1 references in total To uit.mpei.ru:KonovalovaAlA/cs-lab02 4e1efcf..f0a1776 master -> master u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master) $