aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/bob $ git clone http://uit.mpei.ru/git/AulovaAV/cs-lab02.git project Cloning into 'project'... remote: Enumerating objects: 18, done. remote: Counting objects: 100% (18/18), done. remote: Compressing objects: 100% (13/13), done. remote: Total 18 (delta 3), reused 0 (delta 0), pack-reused 0 Receiving objects: 100% (18/18), done. Resolving deltas: 100% (3/3), done. aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/bob $ cd project aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/bob/project (master) $ git config user.name 'Bob(AulovaAV)' aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/bob/project (master) $ git config user.email 'AulovaAV@mpei.ru' aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/bob/project (master) $ git add main.cpp aulov@DESKTOP-AA9LOVM MINGW64 ~/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 aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/bob/project (master) $ git add main.cpp aulov@DESKTOP-AA9LOVM MINGW64 ~/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 aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/bob/project (master) $ git add project.cbp aulov@DESKTOP-AA9LOVM MINGW64 ~/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 aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/bob/project (master) $ git add main.cpp aulov@DESKTOP-AA9LOVM MINGW64 ~/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 aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/bob/project (master) $ git push Everything up-to-date aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/bob/project (master) $ git log --oneline --decorate --all --graph * f885aee (HEAD -> master, origin/master, origin/HEAD) build: add project file * bf12392 git * 3a1f3e2 вывод суммы и разности * 93764fe вывод суммы' * 95b7a85 ввод чисел * fb80f5e code: заготовка программы aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/bob/project (master) $ git log --oneline --decorate --all -graph fatal: unrecognized argument: -graph aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/bob/project (master) $ git log --oneline --decorate --all --graph * f885aee (HEAD -> master, origin/master, origin/HEAD) build: add project file * bf12392 git * 3a1f3e2 вывод суммы и разности * 93764fe вывод суммы' * 95b7a85 ввод чисел * fb80f5e code: заготовка программы aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/bob/project (master) $ git fetch aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/bob/project (master) $ git log --oneline --decorate --all --graph * f885aee (HEAD -> master, origin/master, origin/HEAD) build: add project file * bf12392 git * 3a1f3e2 вывод суммы и разности * 93764fe вывод суммы' * 95b7a85 ввод чисел * fb80f5e code: заготовка программы aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/bob/project (master) $ git pull --ff-only Already up to date. aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/bob/project (master) $ git log --oneline --decorate --all --graph * f885aee (HEAD -> master, origin/master, origin/HEAD) build: add project file * bf12392 git * 3a1f3e2 вывод суммы и разности * 93764fe вывод суммы' * 95b7a85 ввод чисел * fb80f5e code: заготовка программы aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/bob/project (master) $ git fetch aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/bob/project (master) $ git log --oneline --decorate --all --graph * f885aee (HEAD -> master, origin/master, origin/HEAD) build: add project file * bf12392 git * 3a1f3e2 вывод суммы и разности * 93764fe вывод суммы' * 95b7a85 ввод чисел * fb80f5e code: заготовка программы aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/bob/project (master) $ 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 0), reused 0 (delta 0), pack-reused 0 Unpacking objects: 100% (3/3), 463 bytes | 35.00 KiB/s, done. From http://uit.mpei.ru/git/AulovaAV/cs-lab02 f885aee..8001485 master -> origin/master aulov@DESKTOP-AA9LOVM MINGW64 ~/Desktop/lab02/bob/project (master) $ git log --oneline --decorate --all --graph * 8001485 (origin/master, origin/HEAD) code: вывод деления * f885aee (HEAD -> master) build: add project file * bf12392 git * 3a1f3e2 вывод суммы и разности * 93764fe вывод суммы' * 95b7a85 ввод чисел * fb80f5e code: заготовка программы u111-12@PROG-09 MINGW32 ~/Desktop/lab02/bob/project (master) $ git add main.cpp u111-12@PROG-09 MINGW32 ~/Desktop/lab02/bob/project (master) $ git fetch u111-12@PROG-09 MINGW32 ~/Desktop/lab02/bob/project (master) $ 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), done. From http://uit.mpei.ru/git/AulovaAV/cs-lab02 8001485..16ac518 master -> origin/master u111-12@PROG-09 MINGW32 ~/Desktop/lab02/bob/project (master) $ git log --oneline --decorate --all --graph * 16ac518 (origin/master, origin/HEAD) code:деление * 8001485 (HEAD -> master) code: вывод деления * f885aee build: add project file * bf12392 git * 3a1f3e2 вывод суммы и разности * 93764fe вывод суммы' * 95b7a85 ввод чисел * fb80f5e code: заготовка программы u111-12@PROG-09 MINGW32 ~/Desktop/lab02/bob/project (master) $ git fetch u111-12@PROG-09 MINGW32 ~/Desktop/lab02/bob/project (master) $ git log --oneline --decorate --all --graph * 16ac518 (origin/master, origin/HEAD) code:деление * 8001485 (HEAD -> master) code: вывод деления * f885aee build: add project file * bf12392 git * 3a1f3e2 вывод суммы и разности * 93764fe вывод суммы' * 95b7a85 ввод чисел * fb80f5e code: заготовка программы u111-12@PROG-09 MINGW32 ~/Desktop/lab02/bob/project (master) $ git add main.cpp u111-12@PROG-09 MINGW32 ~/Desktop/lab02/bob/project (master) $ git commit -m'code: вывод минимума' [master d1a5e5c] code: вывод минимума Committer: u111-12 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, 6 insertions(+) u111-12@PROG-09 MINGW32 ~/Desktop/lab02/bob/project (master) $ git push To http://uit.mpei.ru/git/AulovaAV/cs-lab02.git ! [rejected] master -> master (fetch first) error: failed to push some refs to 'http://uit.mpei.ru/git/AulovaAV/cs-lab02.git ' 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-12@PROG-09 MINGW32 ~/Desktop/lab02/bob/project (master) $ 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), done. From http://uit.mpei.ru/git/AulovaAV/cs-lab02 16ac518..69ff4fb master -> origin/master u111-12@PROG-09 MINGW32 ~/Desktop/lab02/bob/project (master) $ git log --oneline --decorate --all --graph * d1a5e5c (HEAD -> master) code: вывод минимума | * 69ff4fb (origin/master, origin/HEAD) code: вывод максимума | * 16ac518 code:деление |/ * 8001485 code: вывод деления * f885aee build: add project file * bf12392 git * 3a1f3e2 вывод суммы и разности * 93764fe вывод суммы' * 95b7a85 ввод чисел * fb80f5e code: заготовка программы u111-12@PROG-09 MINGW32 ~/Desktop/lab02/bob/project (master) $ git rebase origin/master First, rewinding head to replay your work on top of it... Applying: code: вывод минимума Using index info to reconstruct a base tree... M main.cpp Falling back to patching base and 3-way merge... Auto-merging main.cpp CONFLICT (content): Merge conflict in main.cpp error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 code: вывод минимума Resolve all conflicts manually, mark them as resolved with "git add/rm ", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort" . u111-12@PROG-09 MINGW32 ~/Desktop/lab02/bob/project (master|REBASE 1/1) $ git log --oneline --decorate --all -graph fatal: unrecognized argument: -graph u111-12@PROG-09 MINGW32 ~/Desktop/lab02/bob/project (master|REBASE 1/1) $ git log --oneline --decorate --all --graph * d1a5e5c (master) code: вывод минимума | * 69ff4fb (HEAD, origin/master, origin/HEAD) code: вывод максимума | * 16ac518 code:деление |/ * 8001485 code: вывод деления * f885aee build: add project file * bf12392 git * 3a1f3e2 вывод суммы и разности * 93764fe вывод суммы' * 95b7a85 ввод чисел * fb80f5e code: заготовка программы u111-12@PROG-09 MINGW32 ~/Desktop/lab02/bob/project (master|REBASE 1/1) $ git add main.cpp u111-12@PROG-09 MINGW32 ~/Desktop/lab02/bob/project (master|REBASE 1/1) $ git rebase --continue Applying: code: вывод минимума u111-12@PROG-09 MINGW32 ~/Desktop/lab02/bob/project (master) $ git push Enumerating objects: 5, done. Counting objects: 100% (5/5), done. Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 426 bytes | 213.00 KiB/s, done. Total 3 (delta 1), reused 0 (delta 0) remote: . Processing 1 references remote: Processed 1 references in total To http://uit.mpei.ru/git/AulovaAV/cs-lab02.git 69ff4fb..08fd3a9 master -> master