From aeb74e2fcaee45cd1caa55aedd253730745a962d Mon Sep 17 00:00:00 2001 From: scozima Date: Sat, 8 Nov 2025 21:23:06 +0900 Subject: [PATCH 01/20] 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..1d11d820b --- /dev/null +++ b/newfile.txt @@ -0,0 +1 @@ +新規作成 \ No newline at end of file From 6f771e01326cb7b9d60ed24f67b24be106a9c96c Mon Sep 17 00:00:00 2001 From: scozima Date: Sun, 9 Nov 2025 10:12:52 +0900 Subject: [PATCH 02/20] chage 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 e5389467a1d63295def87f8e05872a882637cc43 Mon Sep 17 00:00:00 2001 From: scozima Date: Sun, 9 Nov 2025 10:23:59 +0900 Subject: [PATCH 03/20] change name again --- README.md | 2 +- namechanged.txt => namechanged2.txt | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename namechanged.txt => namechanged2.txt (100%) diff --git a/README.md b/README.md index 9e7d03700..99ae64374 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ # git-practice -このリポジトリはGit動画講座用です． +このリポジトリは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 09b607ae3d8b19a8caf0890e6bba87bbde8da3d8 Mon Sep 17 00:00:00 2001 From: scozima Date: Sun, 9 Nov 2025 22:19:34 +0900 Subject: [PATCH 04/20] 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 2760083555235aa9f5eb4937e669bf2637fdb8a1 Mon Sep 17 00:00:00 2001 From: scozima Date: Sun, 9 Nov 2025 22:20:32 +0900 Subject: [PATCH 05/20] 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 485a041f9d53331820a7e6c5e180c642698feefd Mon Sep 17 00:00:00 2001 From: scozima Date: Sun, 9 Nov 2025 22:21:56 +0900 Subject: [PATCH 06/20] 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 046378270ed0e3637fbc5d23962f591d0b515384 Mon Sep 17 00:00:00 2001 From: scozima Date: Sun, 9 Nov 2025 22:28:29 +0900 Subject: [PATCH 07/20] add newfile --- newfile.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 newfile.md diff --git a/newfile.md b/newfile.md new file mode 100644 index 000000000..2e2a5f487 --- /dev/null +++ b/newfile.md @@ -0,0 +1,3 @@ +# 新規作成しました。 + +## ファイル削除した時もgitコマンドで復元する \ No newline at end of file From 45f84bb8601e4c8d94d13dc4456b0210a5d6a036 Mon Sep 17 00:00:00 2001 From: scozima Date: Sun, 9 Nov 2025 22:38:01 +0900 Subject: [PATCH 08/20] make new file --- newfile.md | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 newfile.md diff --git a/newfile.md b/newfile.md deleted file mode 100644 index 2e2a5f487..000000000 --- a/newfile.md +++ /dev/null @@ -1,3 +0,0 @@ -# 新規作成しました。 - -## ファイル削除した時もgitコマンドで復元する \ No newline at end of file From b208f08de7880aac9653223eb330cfbadc16dcec Mon Sep 17 00:00:00 2001 From: scozima Date: Sun, 9 Nov 2025 22:39:17 +0900 Subject: [PATCH 09/20] make new txt --- newtxt.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 newtxt.md diff --git a/newtxt.md b/newtxt.md new file mode 100644 index 000000000..e7269b023 --- /dev/null +++ b/newtxt.md @@ -0,0 +1,5 @@ +# new txt + +- リスト +- リスト +- リスト \ No newline at end of file From 64ff364fc089318a70af143ddad3f3e4f9d3f2b8 Mon Sep 17 00:00:00 2001 From: scozima Date: Sun, 9 Nov 2025 23:44:31 +0900 Subject: [PATCH 10/20] 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 86a835ed9f1ff2e11fd6ee6d08ab23f91b75f0d2 Mon Sep 17 00:00:00 2001 From: scozima Date: Mon, 10 Nov 2025 13:53:48 +0900 Subject: [PATCH 11/20] update readme --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 99ae64374..c81c7300b 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,3 @@ # git-practice -このリポジトリはGit動画講座用です． \ No newline at end of file +このリポジトリはGit動画講座用です． +new-featureブランチで変更 \ No newline at end of file From efd97467c0d729562cc59add79d0bd61047b81fe Mon Sep 17 00:00:00 2001 From: scozima Date: Mon, 10 Nov 2025 14:38:29 +0900 Subject: [PATCH 12/20] update readme automatic --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c81c7300b..8d471a3a0 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． -new-featureブランチで変更 \ No newline at end of file +no-fast-forwardブランチで変更 \ No newline at end of file From 2bd33cbfad2286b4ba6f2ad9bbc6fcf55c34943b Mon Sep 17 00:00:00 2001 From: scozima Date: Mon, 10 Nov 2025 14:40:52 +0900 Subject: [PATCH 13/20] make new file for automatic merge --- 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 41a6eaef973c9786fec4e5e4e70af62a1eba4a9e Mon Sep 17 00:00:00 2001 From: scozima Date: Tue, 11 Nov 2025 10:42:02 +0900 Subject: [PATCH 14/20] update reademe for conflict --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 8d471a3a0..2c61c84d7 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． -no-fast-forwardブランチで変更 \ No newline at end of file +no-fast-forwardブランチで変更 +conflictブランチで変更（コンフリクト発生） \ No newline at end of file From 45948da7590a90de09db4170043a7551b00cc8b8 Mon Sep 17 00:00:00 2001 From: scozima Date: Tue, 11 Nov 2025 10:49:57 +0900 Subject: [PATCH 15/20] update reade for main --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 8d471a3a0..d3b2620b1 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． -no-fast-forwardブランチで変更 \ No newline at end of file +no-fast-forwardブランチで変更 +mainブランチで変更（コンフリクト発生） \ No newline at end of file From 46dfe713ced3b8c02796f659aa18b71290c44789 Mon Sep 17 00:00:00 2001 From: Shimpei Kojima <58152516+scozima@users.noreply.github.com> Date: Wed, 12 Nov 2025 10:15:44 +0900 Subject: [PATCH 16/20] update readme on github --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index bbe2d9446..da7e93125 100644 --- a/README.md +++ b/README.md @@ -2,3 +2,4 @@ このリポジトリはGit動画講座用です． no-fast-forwardブランチで変更 conflictブランチで変更（コンフリクト発生） +Github上で更新 From f87f536606253a4bfe2152e87ecaa531f7457725 Mon Sep 17 00:00:00 2001 From: Shimpei Kojima <58152516+scozima@users.noreply.github.com> Date: Wed, 12 Nov 2025 11:43:27 +0900 Subject: [PATCH 17/20] update readme on github2 --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index da7e93125..efb4c20c3 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ # git-practice このリポジトリはGit動画講座用です． no-fast-forwardブランチで変更 -conflictブランチで変更（コンフリクト発生） -Github上で更新 +conflictブランチで変更（コンフリクト発生） + +Github上で更新2 From 974f4ce0e83f819f7b21cf4966b6dda068bb4926 Mon Sep 17 00:00:00 2001 From: Shimpei Kojima <58152516+scozima@users.noreply.github.com> Date: Wed, 12 Nov 2025 11:51:54 +0900 Subject: [PATCH 18/20] Update README with new GitHub update information --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index efb4c20c3..66d51497a 100644 --- a/README.md +++ b/README.md @@ -3,4 +3,5 @@ no-fast-forwardブランチで変更 conflictブランチで変更（コンフリクト発生） -Github上で更新2 +Github上で更新 +再度Github上で更新 From 465e1587956721899653e4460dc5e775d014fa30 Mon Sep 17 00:00:00 2001 From: scozima Date: Wed, 12 Nov 2025 11:53:00 +0900 Subject: [PATCH 19/20] update reademe --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index efb4c20c3..e2df2b466 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． no-fast-forwardブランチで変更 -conflictブランチで変更（コンフリクト発生） - -Github上で更新2 +conflictブランチで変更（コンフリクト発生） \ No newline at end of file From d5b9488de805fb03e0f512dff40672a9d4fda138 Mon Sep 17 00:00:00 2001 From: scozima Date: Wed, 12 Nov 2025 13:05:46 +0900 Subject: [PATCH 20/20] update readme at my repo --- README.md | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 66a2e4798..7fe54c00f 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,3 @@ # git-practice -このリポジトリはGit動画講座用です． -no-fast-forwardブランチで変更 -conflictブランチで変更（コンフリクト発生） - -Github上で更新 -再度Github上で更新 -コンフリクト解消 \ No newline at end of file +このリポジトリはGit動画講座用です。 +自分のリポジトリで更新。 \ No newline at end of file