From 454f23a0ba0dba3e7d562c5f5897e3f6cb7dd025 Mon Sep 17 00:00:00 2001 From: "pp1109hiro@gmail.com" Date: Sat, 12 Aug 2023 18:20:02 +0900 Subject: [PATCH 01/26] 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..07be1efd3 --- /dev/null +++ b/newfile.txt @@ -0,0 +1 @@ +newfile \ No newline at end of file From f3ad49dd952ffc72f7e7c608f5f0c8a602a717a8 Mon Sep 17 00:00:00 2001 From: "pp1109hiro@gmail.com" Date: Sat, 12 Aug 2023 23:43:26 +0900 Subject: [PATCH 02/26] change file --- 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 701ca784fcd8f3a81e7415e176991ce6b39b5926 Mon Sep 17 00:00:00 2001 From: "pp1109hiro@gmail.com" Date: Sat, 12 Aug 2023 23:48:38 +0900 Subject: [PATCH 03/26] 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..ebb7d4cc8 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． +更新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 9de0a34eda212d3a489bf10678d331b7e8b37f24 Mon Sep 17 00:00:00 2001 From: "pp1109hiro@gmail.com" Date: Sun, 13 Aug 2023 22:23:38 +0900 Subject: [PATCH 04/26] delete-soon --- 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 f6b77621d5a25bc442d2ef7801e343d790733ffd Mon Sep 17 00:00:00 2001 From: "pp1109hiro@gmail.com" Date: Sun, 13 Aug 2023 22:25:22 +0900 Subject: [PATCH 05/26] 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 a81fef948b552436b53ab139ef2a547d7e64e885 Mon Sep 17 00:00:00 2001 From: "pp1109hiro@gmail.com" Date: Sun, 13 Aug 2023 22:28:51 +0900 Subject: [PATCH 06/26] 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 2eba1185453b7603ee40aab754767bf776bed245 Mon Sep 17 00:00:00 2001 From: "pp1109hiro@gmail.com" Date: Mon, 14 Aug 2023 22:38:06 +0900 Subject: [PATCH 07/26] add git ignore --- .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 856ccf81192e9c06ad0ea31000892f2da2327373 Mon Sep 17 00:00:00 2001 From: s46hiroaki <109454108+s46hiroaki@users.noreply.github.com> Date: Tue, 5 Sep 2023 23:09:00 +0900 Subject: [PATCH 08/26] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index ebb7d4cc8..9c9913cf5 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． -更新1 \ No newline at end of file +更新1 +#Git-Hub上で更新 From c33168b0eb1501e3b4d3d0250c17dbc89e3ecaf4 Mon Sep 17 00:00:00 2001 From: s46hiroaki <109454108+s46hiroaki@users.noreply.github.com> Date: Tue, 5 Sep 2023 23:10:49 +0900 Subject: [PATCH 09/26] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 9c9913cf5..72f72334e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ # git-practice このリポジトリはGit動画講座用です． 更新1 -#Git-Hub上で更新 +#Git-Hub上で更新! + From e88dcfa743955a005ac54d06ebbb11bb881d335d Mon Sep 17 00:00:00 2001 From: s46hiroaki Date: Tue, 25 Nov 2025 14:26:22 +0900 Subject: [PATCH 10/26] 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..b78ca63fe --- /dev/null +++ b/newfile.txt @@ -0,0 +1 @@ +New file \ No newline at end of file From 88c2e737c18d4433ff7de9268828089e0a476f24 Mon Sep 17 00:00:00 2001 From: s46hiroaki Date: Tue, 25 Nov 2025 15:01:10 +0900 Subject: [PATCH 11/26] 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 09aa8b8c26ed6774ae0c85f7749d344e0de1d4ff Mon Sep 17 00:00:00 2001 From: s46hiroaki Date: Tue, 25 Nov 2025 15:05:14 +0900 Subject: [PATCH 12/26] change name again --- README.md | 4 ++-- namechanged.txt => namechanged3.txt | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename namechanged.txt => namechanged3.txt (100%) diff --git a/README.md b/README.md index 72f72334e..11c969365 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # git-practice このリポジトリはGit動画講座用です． -更新1 -#Git-Hub上で更新! +ローカルリポで変更 + diff --git a/namechanged.txt b/namechanged3.txt similarity index 100% rename from namechanged.txt rename to namechanged3.txt From fa59ef0df73cb2219e51d7a86ff8ab0624f5cdc2 Mon Sep 17 00:00:00 2001 From: s46hiroaki Date: Tue, 25 Nov 2025 15:15:06 +0900 Subject: [PATCH 13/26] make new file --- delete-soon2.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 delete-soon2.txt diff --git a/delete-soon2.txt b/delete-soon2.txt new file mode 100644 index 000000000..e69de29bb From 5bd2fb270ce5e8396d32ff19d2fdd4359f4e8407 Mon Sep 17 00:00:00 2001 From: s46hiroaki Date: Tue, 25 Nov 2025 15:16:18 +0900 Subject: [PATCH 14/26] delete file --- delete-soon2.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 delete-soon2.txt diff --git a/delete-soon2.txt b/delete-soon2.txt deleted file mode 100644 index e69de29bb..000000000 From 4c60f10083f8032eaeb86a193e08f44db68216e3 Mon Sep 17 00:00:00 2001 From: s46hiroaki Date: Tue, 25 Nov 2025 15:17:59 +0900 Subject: [PATCH 15/26] new file --- delete-soon2.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 delete-soon2.txt diff --git a/delete-soon2.txt b/delete-soon2.txt new file mode 100644 index 000000000..e69de29bb From ab4d3123517bbab796d7a641094b8b5460403afb Mon Sep 17 00:00:00 2001 From: s46hiroaki Date: Tue, 25 Nov 2025 17:09:17 +0900 Subject: [PATCH 16/26] update readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 11c969365..cd511d005 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 - +New-feature ブランチで変更 From a7ebb7baec9fe197577350dd4dbaad7d84a5967e Mon Sep 17 00:00:00 2001 From: s46hiroaki Date: Thu, 27 Nov 2025 13:53:40 +0900 Subject: [PATCH 17/26] update readme for automatic merge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cd511d005..ca1ca0567 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -New-feature ブランチで変更 +No-fast-fowardブランチで変更 From f46ee9126ec65948a90e52f0faeec6dc0d76efeb Mon Sep 17 00:00:00 2001 From: s46hiroaki Date: Thu, 27 Nov 2025 13:56:41 +0900 Subject: [PATCH 18/26] 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..e0d279bbb --- /dev/null +++ b/newfile.txt @@ -0,0 +1 @@ +Newfile \ No newline at end of file From 579677a3dfb9a9821678d3ff2eaf8c09d87d68be Mon Sep 17 00:00:00 2001 From: s46hiroaki Date: Thu, 27 Nov 2025 14:08:03 +0900 Subject: [PATCH 19/26] update readme on conflict branch --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ca1ca0567..3e0053099 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -No-fast-fowardブランチで変更 +Conflictブランチで変更 From ed95633240532d336a6444dfb7fbda882958ce6f Mon Sep 17 00:00:00 2001 From: s46hiroaki Date: Thu, 27 Nov 2025 14:09:55 +0900 Subject: [PATCH 20/26] update readme on main --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ca1ca0567..a12dad683 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -No-fast-fowardブランチで変更 +Mainブランチで変更 From e16da2d8902a82b8ff36156ff15d9453df1cfb72 Mon Sep 17 00:00:00 2001 From: s46hiroaki <109454108+s46hiroaki@users.noreply.github.com> Date: Thu, 27 Nov 2025 14:30:30 +0900 Subject: [PATCH 21/26] Update README.md on GitHub --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index ba183983c..ebee7a9d4 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． -ローカルリポで変更 -Conflictブランチで変更 +GitHub上で更新 From ddda82179f40e214cb559f7c382ea912b2544897 Mon Sep 17 00:00:00 2001 From: s46hiroaki <109454108+s46hiroaki@users.noreply.github.com> Date: Thu, 27 Nov 2025 14:42:30 +0900 Subject: [PATCH 22/26] 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 ebee7a9d4..9255e0baa 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． -GitHub上で更新 +GitHub上で更新二回目 From 696beab03c3fc008fba945312d688c1076cf7162 Mon Sep 17 00:00:00 2001 From: s46hiroaki Date: Thu, 27 Nov 2025 14:43:54 +0900 Subject: [PATCH 23/26] update readme on conflict-remote --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ebee7a9d4..19f1c6c05 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． -GitHub上で更新 +conflict-remote上で更新 From 4030f9ff04ffdaa08e9ab9e1394a8bce63c4ede4 Mon Sep 17 00:00:00 2001 From: s46hiroaki Date: Thu, 27 Nov 2025 14:57:37 +0900 Subject: [PATCH 24/26] 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 ff03dc544..55ec496d3 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． -GitHub上で更新二回目 +Conflict-Remote上で更新 From 2e41c5e25546af79e48b9c2459bfeed252bb4530 Mon Sep 17 00:00:00 2001 From: s46hiroaki <109454108+s46hiroaki@users.noreply.github.com> Date: Thu, 27 Nov 2025 14:59:24 +0900 Subject: [PATCH 25/26] Update README.md on GitHub for conflict3 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9255e0baa..913e79ae2 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． -GitHub上で更新二回目 +GitHub上で更新3回目 From a0d48da64428000338076e1eea222ca46f80844d Mon Sep 17 00:00:00 2001 From: s46hiroaki Date: Thu, 27 Nov 2025 15:32:01 +0900 Subject: [PATCH 26/26] update readme at my pc --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 55ec496d3..e62b1a54c 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． -Conflict-Remote上で更新 - +自分のリポジトリで更新