From d25fd66b2ac3442af5415c0241ff855faf10051c Mon Sep 17 00:00:00 2001 From: tunotatuyuki Date: Thu, 5 Jun 2025 22:39:03 +0900 Subject: [PATCH 01/16] add newfile --- newfile.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 newfile.txt diff --git a/newfile.txt b/newfile.txt new file mode 100644 index 000000000..99c7b7d92 --- /dev/null +++ b/newfile.txt @@ -0,0 +1 @@ +newfile作成 \ No newline at end of file From 4be91ee78ab9529b4e396beb378bf0eb8304128a Mon Sep 17 00:00:00 2001 From: tunotatuyuki Date: Sun, 8 Jun 2025 10:39:26 +0900 Subject: [PATCH 02/16] change name --- newfile.txt => namechanged.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename newfile.txt => namechanged.txt (100%) diff --git a/newfile.txt b/namechanged.txt similarity index 100% rename from newfile.txt rename to namechanged.txt From a34aa009c5c59dc0ec1d44f4b1586b4285f1c534 Mon Sep 17 00:00:00 2001 From: tunotatuyuki Date: Sun, 8 Jun 2025 10:45:56 +0900 Subject: [PATCH 03/16] change name again --- READE.md | 1 + namechanged.txt => namechanged2.txt | 0 2 files changed, 1 insertion(+) create mode 100644 READE.md rename namechanged.txt => namechanged2.txt (100%) diff --git a/READE.md b/READE.md new file mode 100644 index 000000000..0c622d71d --- /dev/null +++ b/READE.md @@ -0,0 +1 @@ +ローカルリポで変更 \ No newline at end of file diff --git a/namechanged.txt b/namechanged2.txt similarity index 100% rename from namechanged.txt rename to namechanged2.txt From a3d59407ddde23d02a622cf637efdfd38ad3edc5 Mon Sep 17 00:00:00 2001 From: tunotatuyuki Date: Sun, 8 Jun 2025 11:03:16 +0900 Subject: [PATCH 04/16] make new file --- delete_soon.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 delete_soon.txt diff --git a/delete_soon.txt b/delete_soon.txt new file mode 100644 index 000000000..e69de29bb From dcd71840a8a627cbc0f5d6159884c5a4b98df742 Mon Sep 17 00:00:00 2001 From: tunotatuyuki Date: Sun, 8 Jun 2025 11:05:22 +0900 Subject: [PATCH 05/16] delete file --- delete_soon.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 delete_soon.txt diff --git a/delete_soon.txt b/delete_soon.txt deleted file mode 100644 index e69de29bb..000000000 From 4a6d64fb3087d6f6b73bce73ca3bc5c919936c2f Mon Sep 17 00:00:00 2001 From: tunotatuyuki Date: Sun, 8 Jun 2025 11:08:36 +0900 Subject: [PATCH 06/16] new file --- delete_soon.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 delete_soon.txt diff --git a/delete_soon.txt b/delete_soon.txt new file mode 100644 index 000000000..e69de29bb From b7fb1e97b3c8e13819566720a1e889cd294c824e Mon Sep 17 00:00:00 2001 From: tunotatuyuki Date: Sun, 8 Jun 2025 15:50:11 +0900 Subject: [PATCH 07/16] add gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..f0de82f57 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +output.log \ No newline at end of file From af4958e8e4735efbadc0ebf57aa1476236871cf4 Mon Sep 17 00:00:00 2001 From: tunotatuyuki Date: Mon, 9 Jun 2025 19:56:54 +0900 Subject: [PATCH 08/16] update readme --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 9e7d03700..c48f8684e 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,5 @@ # git-practice このリポジトリはGit動画講座用です． +ローカルリポで変更 +new-featureブランチで変更 + From 8a1911d771c9932eecc703f0b2785f2b2629d4fb Mon Sep 17 00:00:00 2001 From: tunotatuyuki Date: Mon, 9 Jun 2025 21:37:12 +0900 Subject: [PATCH 09/16] update readme for automatic merge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c48f8684e..160c94a5a 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -new-featureブランチで変更 +no-fast-forwardブランチで変更 From b2690751d4bb3394b034474e07cf106d1f8d1e94 Mon Sep 17 00:00:00 2001 From: tunotatuyuki Date: Mon, 9 Jun 2025 21:44:10 +0900 Subject: [PATCH 10/16] make new file --- newfile.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 newfile.txt diff --git a/newfile.txt b/newfile.txt new file mode 100644 index 000000000..3a63a982e --- /dev/null +++ b/newfile.txt @@ -0,0 +1 @@ +created new file!! \ No newline at end of file From 6c52570706307a2d2f338c21161f02fdbc8001c7 Mon Sep 17 00:00:00 2001 From: tunotatuyuki Date: Tue, 10 Jun 2025 21:26:10 +0900 Subject: [PATCH 11/16] update readme on conflict branch for conflict --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 160c94a5a..5a31b19c5 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -no-fast-forwardブランチで変更 +conflictブランチで変更（コンフリクト発生） From 3ae36ab1bd0a7e52608f2faffd720904c9c16a98 Mon Sep 17 00:00:00 2001 From: tunotatuyuki Date: Tue, 10 Jun 2025 21:31:14 +0900 Subject: [PATCH 12/16] update readme on main for conflict --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 160c94a5a..98af13465 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -no-fast-forwardブランチで変更 +mainブランチで変更(コンフリクト発生) From 1d19f6c242b74c3a20570210bea2348b24c736fb Mon Sep 17 00:00:00 2001 From: tunotatuyuki Date: Thu, 12 Jun 2025 22:45:47 +0900 Subject: [PATCH 13/16] Update README.md on github --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7f7489f89..fc8f1fd58 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -conflictブランチで変更（コンフリクト発生） +github上で更新 From 7f529adad9e62f1f8d5e99abded5b67813a9ef63 Mon Sep 17 00:00:00 2001 From: tunotatuyuki Date: Fri, 13 Jun 2025 21:34:27 +0900 Subject: [PATCH 14/16] =?UTF-8?q?Update=20README.md=E3=80=80on=20github=20?= =?UTF-8?q?for=20confrict?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fc8f1fd58..7dc362e1b 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -github上で更新 +github上で更新2回目 From 6b5ddb242b6037db1a12f2d25ce86ae272511b85 Mon Sep 17 00:00:00 2001 From: tunotatuyuki Date: Fri, 13 Jun 2025 21:39:35 +0900 Subject: [PATCH 15/16] update readme on conflict-remote for conflict --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fc8f1fd58..310334305 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -github上で更新 +conflict-remote上で更新（コンフリクト発生） From 4ea4c8353da188615563e75c9544954f633fffff Mon Sep 17 00:00:00 2001 From: tunotatuyuki Date: Fri, 13 Jun 2025 22:24:37 +0900 Subject: [PATCH 16/16] update readme at my repo --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 997acbc59..e73e14be5 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ # git-practice このリポジトリはGit動画講座用です． -ローカルリポで変更 -conflict-remote上で更新（コンフリクト発生） +自分のリポジトリで更新