u111-13@PROG-25 MINGW32 ~/Desktop/lab02/alice/project $ git init Initialized empty Git repository in C:/Users/u111-13/Desktop/lab02/alice/project/.git/ u111-13@PROG-25 MINGW32 ~/Desktop/lab02/alice/project (master) $ git config user.name 'Alice (DenisovPS)' u111-13@PROG-25 MINGW32 ~/Desktop/lab02/alice/project (master) $ git config user.email 'DenisovPS@mpei.ru' u111-13@PROG-25 MINGW32 ~/Desktop/lab02/alice/project (master) $ git add main.cpp u111-13@PROG-25 MINGW32 ~/Desktop/lab02/alice/project (master) $ git commit -m 'code: caaioiaea i?ia?aiiu' [master (root-commit) b272f36] code: caaioiaea i?ia?aiiu 1 file changed, 9 insertions(+) create mode 100644 main.cpp u111-13@PROG-25 MINGW32 ~/Desktop/lab02/alice/project (master) $ git branch -m main u111-13@PROG-25 MINGW32 ~/Desktop/lab02/alice/project (main) $ git add project.cbp warning: LF will be replaced by CRLF in project.cbp. The file will have its original line endings in your working directory u111-13@PROG-25 MINGW32 ~/Desktop/lab02/alice/project (main) $ git commit -m 'build: aiaaaeai oaee i?iaeoa' [main fee1a91] build: aiaaaeai oaee i?iaeoa 1 file changed, 40 insertions(+) create mode 100644 project.cbp u111-13@PROG-25 MINGW32 ~/Desktop/lab02/alice/project (main) $ git add main.cpp u111-13@PROG-25 MINGW32 ~/Desktop/lab02/alice/project (main) $ git commit -m "code: aaia ?enae" [main e50f914] code: aaia ?enae 1 file changed, 3 insertions(+), 1 deletion(-) u111-13@PROG-25 MINGW32 ~/Desktop/lab02/alice/project (main) $ git add -u u111-13@PROG-25 MINGW32 ~/Desktop/lab02/alice/project (main) $ git commit -m "code: auaia noiiu" [main 78a56e6] code: auaia noiiu 1 file changed, 2 insertions(+), 1 deletion(-) u111-13@PROG-25 MINGW32 ~/Desktop/lab02/alice/project (main) $ git commit -a -m "..." [main d24d306] ... 1 file changed, 2 insertions(+), 1 deletion(-) u111-13@PROG-25 MINGW32 ~/Desktop/lab02/alice/project (main) $ git commit -a -m "code: auaia ?aciinoe" --amend [main dc9a83f] code: auaia ?aciinoe Date: Mon Apr 17 14:19:38 2023 +0300 1 file changed, 2 insertions(+), 1 deletion(-) u111-13@PROG-25 MINGW32 ~/Desktop/lab02/alice/project (main) $ git add .gitignore u111-13@PROG-25 MINGW32 ~/Desktop/lab02/alice/project (main) $ git commit -m "build: eaii?e?iaaiea oaeeia" [main 152446e] build: eaii?e?iaaiea oaeeia 1 file changed, 3 insertions(+) create mode 100644 .gitignore u111-13@PROG-25 MINGW32 ~/Desktop/lab02/alice/project (main) $ git add main.cpp u111-13@PROG-25 MINGW32 ~/Desktop/lab02/alice/project (main) $ git commit -m 'code: auaia i?iecaaaaiey' [main 95df2d8] code: auaia i?iecaaaaiey 1 file changed, 2 insertions(+), 1 deletion(-) u111-13@PROG-25 MINGW32 ~/Desktop/lab02/alice/project (main) $ ssh-keygen Generating public/private rsa key pair. Enter file in which to save the key (/c/Users/u111-13/.ssh/id_rsa): Created directory '/c/Users/u111-13/.ssh'. Enter passphrase (empty for no passphrase): Enter same passphrase again: Your identification has been saved in /c/Users/u111-13/.ssh/id_rsa. Your public key has been saved in /c/Users/u111-13/.ssh/id_rsa.pub. The key fingerprint is: SHA256:8Dz7Li7U665hr4xy1vGhjZ0Q8HgP0WM/ur21VxTyMjM u111-13@PROG-25 The key's randomart image is: +---[RSA 2048]----+ | . | | . . + . . | | +.o o o .| | . =+ o E ..| | . =S. . =. | | + =o .| | ooO.* . . | | . o+=oO... .. | | +. +B=o+... | +----[SHA256]-----+ u111-13@PROG-25 MINGW32 ~/Desktop/lab02/alice/project (main) $ eval $(ssh-agent -s) Agent pid 3496 u111-13@PROG-25 MINGW32 ~/Desktop/lab02/alice/project (main) $ ssh-add Identity added: /c/Users/u111-13/.ssh/id_rsa (u111-13@PROG-25) u111-13@PROG-25 MINGW32 ~/Desktop/lab02/alice/project (main) $ cat ~/.ssh/id_rsa.pub ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDGo1N921FsUGf7PgVxf32kIBGWI1xVl2Xg21sOHVRh65YSwfcnqbNTLH8m9IVMYijm5Y0QLKG8ME3KGnVFDPk4gYxV9Mv3ytj2UDk3BA3K4obSHtSwT2FTr/02c4aZ+hR/StbnSByE/JLmr71pWTxM5JQFuLiGEXIdCV5i6lPGpJgY3SYRmE1jUvAskInmnAk3074BLmNL2xvYcQartv+BNa7AoZOTwCAlX2BiQIXEucmI5vujE8UntcW4ne8IcAXHnq68MmGKNUidZ1Gjs5fh16xOD/nZLnAa9lHRQTmGr8Nv29HoDXbfR4hnlnUc9NvrT1ovebIgx4RwZjgiy1mP u111-13@PROG-25 u111-13@PROG-25 MINGW32 ~/Desktop/lab02/alice/project (main) $ git remote add origin git@uit.mpei.ru:DenisovPS/cs-lab02.git u111-13@PROG-25 MINGW32 ~/Desktop/lab02/alice/project (main) $ git push -u origin main The authenticity of host 'uit.mpei.ru (10.1.6.13)' can't be established. ECDSA key fingerprint is SHA256:+MRh1ssS2MjYzxp1zO+xbhzkFjtvbXFwcP0Nuzb7bD8. Are you sure you want to continue connecting (yes/no)? Host key verification failed. fatal: Could not read from remote repository. Please make sure you have the correct access rights and the repository exists. u111-13@PROG-25 MINGW32 ~/Desktop/lab02/alice/project (main) $ $ git push -u origin main ECDSA key fingerprint is SHA256:+MRh1ssS2MjYzxp1zO+xbhzkFjtvbXFwcP0Nuzb7bD8. Are you sure you want to continue connecting (yes/no)? Host key verification failed. fatal: Could not read from remote repository. Please make sure you have the correct access rights and the repository exists. bash: $: command not found u111-13@PROG-25 MINGW32 ~/Desktop/lab02/alice/project (main) $ The authenticity of host 'uit.mpei.ru (10.1.6.13)' can't be established. > ECDSA key fingerprint is SHA256:+MRh1ssS2MjYzxp1zO+xbhzkFjtvbXFwcP0Nuzb7bD8. > Are you sure you want to continue connecting (yes/no)? > Host key verification failed. > fatal: Could not read from remote repository. > > Please make sure you have the correct access rights > and the repository exists. > > ^C u111-13@PROG-25 MINGW32 ~/Desktop/lab02/alice/project (main) $ $ git push -u origin main bash: $: command not found u111-13@PROG-25 MINGW32 ~/Desktop/lab02/alice/project (main) $ git push -u origin main The authenticity of host 'uit.mpei.ru (10.1.6.13)' can't be established. ECDSA key fingerprint is SHA256:+MRh1ssS2MjYzxp1zO+xbhzkFjtvbXFwcP0Nuzb7bD8. Are you sure you want to continue connecting (yes/no)? yes Warning: Permanently added 'uit.mpei.ru,10.1.6.13' (ECDSA) to the list of known hosts. Enumerating objects: 21, done. Counting objects: 100% (21/21), done. Compressing objects: 100% (19/19), done. Writing objects: 100% (21/21), 2.67 KiB | 248.00 KiB/s, done. Total 21 (delta 3), reused 0 (delta 0) remote: . Processing 1 references remote: Processed 1 references in total To uit.mpei.ru:DenisovPS/cs-lab02.git * [new branch] main -> main Branch 'main' set up to track remote branch 'main' from 'origin'. u111-13@PROG-25 MINGW32 ~/Desktop/lab02/alice/project (main) $ git remote -v origin git@uit.mpei.ru:DenisovPS/cs-lab02.git (fetch) origin git@uit.mpei.ru:DenisovPS/cs-lab02.git (push) u111-13@PROG-25 MINGW32 ~/Desktop/lab02/alice/project (main) $ # --force-with-lease u111-13@PROG-25 MINGW32 ~/Desktop/lab02/alice/project (main) $ git reset --hard main~1 HEAD is now at 152446e build: eaii?e?iaaiea oaeeia u111-13@PROG-25 MINGW32 ~/Desktop/lab02/alice/project (main) $ git push --force-with-lease Total 0 (delta 0), reused 0 (delta 0) remote: . Processing 1 references remote: Processed 1 references in total To uit.mpei.ru:DenisovPS/cs-lab02.git + 95df2d8...152446e main -> main (forced update) u111-13@PROG-25 MINGW32 ~/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), done. From uit.mpei.ru:DenisovPS/cs-lab02 152446e..673e788 main -> origin/main u111-13@PROG-25 MINGW32 ~/Desktop/lab02/alice/project (main) $ git pull --ff-only Updating 152446e..673e788 Fast-forward main.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) u111-13@PROG-25 MINGW32 ~/Desktop/lab02/alice/project (main) $ git add main.cpp u111-13@PROG-25 MINGW32 ~/Desktop/lab02/alice/project (main) $ git commit -m 'code: auaia aaeaeaiey' [main 576a93d] code: auaia aaeaeaiey 1 file changed, 2 insertions(+), 1 deletion(-) u111-13@PROG-25 MINGW32 ~/Desktop/lab02/alice/project (main) $ git push Enumerating objects: 5, done. Counting objects: 100% (5/5), done. Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 420 bytes | 420.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:DenisovPS/cs-lab02.git 673e788..576a93d main -> main u111-13@PROG-25 MINGW32 ~/Desktop/lab02/alice/project (main) $ git add main.cpp u111-13@PROG-25 MINGW32 ~/Desktop/lab02/alice/project (main) $ git commit -m "code: auaia iaeneioia" [main 284e013] code: auaia iaeneioia 1 file changed, 2 insertions(+), 1 deletion(-) u111-13@PROG-25 MINGW32 ~/Desktop/lab02/alice/project (main) $ git push To uit.mpei.ru:DenisovPS/cs-lab02.git ! [rejected] main -> main (fetch first) error: failed to push some refs to 'git@uit.mpei.ru:DenisovPS/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-13@PROG-25 MINGW32 ~/Desktop/lab02/alice/project (main) $ git rebase origin/main Current branch main is up to date. u111-13@PROG-25 MINGW32 ~/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), done. From uit.mpei.ru:DenisovPS/cs-lab02 576a93d..8425f5a main -> origin/main u111-13@PROG-25 MINGW32 ~/Desktop/lab02/alice/project (main) $ git rebase origin/main First, rewinding head to replay your work on top of it... Applying: code: auaia iaeneioia 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: auaia iaeneioia 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-13@PROG-25 MINGW32 ~/Desktop/lab02/alice/project (main|REBASE 1/1) $ git add main.cpp u111-13@PROG-25 MINGW32 ~/Desktop/lab02/alice/project (main|REBASE 1/1) $ git rebase --continue Applying: code: auaia iaeneioia u111-13@PROG-25 MINGW32 ~/Desktop/lab02/alice/project (main) $ git push Enumerating objects: 5, done. Counting objects: 100% (5/5), done. Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 436 bytes | 436.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:DenisovPS/cs-lab02.git 8425f5a..e912d34 main -> main u111-13@PROG-25 MINGW32 ~/Desktop/lab02/alice/project (main) $