From 59c5401a04aabc778d13f230f14977b5fc5c2d2c Mon Sep 17 00:00:00 2001 From: kuu1610 Date: Sat, 15 Nov 2025 11:59:30 +0900 Subject: [PATCH 01/17] 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..ff849700b --- /dev/null +++ b/newfile.txt @@ -0,0 +1 @@ + newfile作成 \ No newline at end of file From 2d17dc73fe6b74de1e40dd876b791827f6739576 Mon Sep 17 00:00:00 2001 From: kuu1610 Date: Sat, 15 Nov 2025 12:49:41 +0900 Subject: [PATCH 02/17] 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 ff8ee77ec1fe6aeada095adbac23870969b1f2fd Mon Sep 17 00:00:00 2001 From: kuu1610 Date: Sat, 15 Nov 2025 13:02:16 +0900 Subject: [PATCH 03/17] change name again --- README.md | 1 + namechanged.txt => namechanged2.txt | 0 2 files changed, 1 insertion(+) rename namechanged.txt => namechanged2.txt (100%) diff --git a/README.md b/README.md index 9e7d03700..e05b801e5 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． +ローカルリポで変更 \ 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 a7ac6c1587dbe1dd7a32389d49b247192f4a20ac Mon Sep 17 00:00:00 2001 From: kuu1610 Date: Sat, 15 Nov 2025 13:32:12 +0900 Subject: [PATCH 04/17] 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 22fcae6c87bef629af39ac5a0655c9d383e09d6b Mon Sep 17 00:00:00 2001 From: kuu1610 Date: Sat, 15 Nov 2025 13:36:12 +0900 Subject: [PATCH 05/17] 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 3cbff76598833389cab39a40f69542a9df270dd6 Mon Sep 17 00:00:00 2001 From: kuu1610 Date: Sat, 15 Nov 2025 14:49:02 +0900 Subject: [PATCH 06/17] 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 81d672e41f9590f622ec190efc53ba9f6c5f6b19 Mon Sep 17 00:00:00 2001 From: kuu1610 Date: Sat, 15 Nov 2025 15:22:33 +0900 Subject: [PATCH 07/17] 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 808d4b5a8eb22949ece929dd2c53e92e213c5e86 Mon Sep 17 00:00:00 2001 From: kuu1610 Date: Sat, 15 Nov 2025 17:47:17 +0900 Subject: [PATCH 08/17] update README.md --- READEME.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 READEME.md diff --git a/READEME.md b/READEME.md new file mode 100644 index 000000000..cabc93996 --- /dev/null +++ b/READEME.md @@ -0,0 +1 @@ +new-feature \ No newline at end of file From be3b8401339b8be1d84294c8528bfa788b26e30c Mon Sep 17 00:00:00 2001 From: kuu1610 Date: Sat, 15 Nov 2025 17:55:30 +0900 Subject: [PATCH 09/17] delete READEME --- READEME.md | 1 - README.md | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 READEME.md diff --git a/READEME.md b/READEME.md deleted file mode 100644 index cabc93996..000000000 --- a/READEME.md +++ /dev/null @@ -1 +0,0 @@ -new-feature \ No newline at end of file diff --git a/README.md b/README.md index e05b801e5..8111cd89c 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． -ローカルリポで変更 \ No newline at end of file +ローカルリポで変更 +new-feature \ No newline at end of file From 4d4d1ecb82e18ea822cead1e5cbdf262489dbe92 Mon Sep 17 00:00:00 2001 From: kuu1610 Date: Sat, 15 Nov 2025 18:18:13 +0900 Subject: [PATCH 10/17] update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8111cd89c..d88999d69 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -new-feature \ No newline at end of file +no-fast-forward \ No newline at end of file From e6f22ebe345ba77d621c0406997d68a7a024a4a3 Mon Sep 17 00:00:00 2001 From: kuu1610 Date: Sat, 15 Nov 2025 18:20:15 +0900 Subject: [PATCH 11/17] update newfile.txt --- newfile.txt | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 newfile.txt diff --git a/newfile.txt b/newfile.txt new file mode 100644 index 000000000..27aeaa5a8 --- /dev/null +++ b/newfile.txt @@ -0,0 +1,2 @@ +main +newfile \ No newline at end of file From f712ad35ba0cb292516f78bd16cd53985484d377 Mon Sep 17 00:00:00 2001 From: kuu1610 Date: Sat, 15 Nov 2025 18:59:11 +0900 Subject: [PATCH 12/17] readme update for conflict --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d88999d69..eebfcfb68 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -no-fast-forward \ No newline at end of file +conflictで編集 \ No newline at end of file From 416d662cb3bce27248ed2214b9ed15007fd9743f Mon Sep 17 00:00:00 2001 From: kuu1610 Date: Sat, 15 Nov 2025 19:02:05 +0900 Subject: [PATCH 13/17] readme update for main --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d88999d69..b8f4fa589 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -no-fast-forward \ No newline at end of file +mainで変更 \ No newline at end of file From 0efc5d669c8e00c80e5a926d0320d1de46c56b07 Mon Sep 17 00:00:00 2001 From: kuu1610 Date: Sat, 15 Nov 2025 21:03:04 +0900 Subject: [PATCH 14/17] Update README.md on github --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dcc13baf4..f88892923 100644 --- a/README.md +++ b/README.md @@ -2,5 +2,5 @@ このリポジトリはGit動画講座用です． ローカルリポで変更 -conflictで編集 +GitHUB上で更新 From fa5f81a6ab9a752607764b8fcc598ff0978e4f86 Mon Sep 17 00:00:00 2001 From: kuu1610 Date: Sat, 15 Nov 2025 21:21:55 +0900 Subject: [PATCH 15/17] Update README.md on github for conflict --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f88892923..042fdd229 100644 --- a/README.md +++ b/README.md @@ -2,5 +2,5 @@ このリポジトリはGit動画講座用です． ローカルリポで変更 -GitHUB上で更新 +GitHUB上で更新2回目 From 4855ae5e27413ed1aa9c42ad239d0333ba55e8db Mon Sep 17 00:00:00 2001 From: kuu1610 Date: Sat, 15 Nov 2025 21:24:22 +0900 Subject: [PATCH 16/17] update readme on confilict-remote --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f88892923..c53eb310b 100644 --- a/README.md +++ b/README.md @@ -2,5 +2,5 @@ このリポジトリはGit動画講座用です． ローカルリポで変更 -GitHUB上で更新 +conflict-remote上で更新 From 7f0960332feb6efd0ea44d2e8c9777c412339c12 Mon Sep 17 00:00:00 2001 From: kuu1610 Date: Sat, 15 Nov 2025 22:19:43 +0900 Subject: [PATCH 17/17] update readme at my repo --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 93bb55eeb..21953435b 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,5 @@ # git-practice このリポジトリはGit動画講座用です． -ローカルリポで変更 - -conflict-remote上で更新 +自分のリポジトリで更新