From e8821e942f563cb1d84ef773f424dc5de7124a78 Mon Sep 17 00:00:00 2001 From: "Alice (KrivobokovNS)" Date: Tue, 1 Jul 2025 17:55:34 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=20README?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/README.txt b/README.txt index 512bc53..1d98da0 100644 --- a/README.txt +++ b/README.txt @@ -587,6 +587,17 @@ $ git checkout main Switched to branch 'main' Your branch is up to date with 'origin/main'. +kolya@Nikolay MINGW64 ~/Desktop/lab02/alice/project (main) +$ git merge double +Updating e9b63fb..20dc1e5 +Fast-forward + main.cpp | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +//// +История с ошибкой утеряна из-за непреднамеренного перезапуска компьютера. +//// + kolya@Nikolay MINGW64 ~/Desktop/lab02/alice/project (main) $ git fetch remote: Enumerating objects: 5, done.