diff --git a/README.txt b/README.txt index b6799b0..51e383a 100644 --- a/README.txt +++ b/README.txt @@ -311,16 +311,7 @@ $ git checkout master Switched to branch 'master' Your branch is up to date with 'origin/master'. -u111-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master) -$ git push -To uit.mpei.ru:NovikovDM/cs-lab02.git - ! [rejected] master -> master (fetch first) -error: failed to push some refs to 'git@uit.mpei.ru:NovikovDM/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-09@PROG-29 MINGW32 ~/Desktop/lab02/alice/project (master) $ git pull @@ -645,12 +636,6 @@ 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 @@ -662,12 +647,7 @@ 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