From 058a253ff0dfe884108be1c59d85a1d6d450bf50 Mon Sep 17 00:00:00 2001 From: MasahideHayashi Date: Thu, 2 Oct 2025 13:57:55 +0900 Subject: [PATCH 01/16] add 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..99c7b7d92 --- /dev/null +++ b/newfile.txt @@ -0,0 +1 @@ +newfile作成 \ No newline at end of file From 543dea7dd88821e98b8daaf814aac0710bad53db Mon Sep 17 00:00:00 2001 From: MasahideHayashi Date: Thu, 2 Oct 2025 14:10:28 +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 0b562930919f7b6c4e5463ae9ad0413801c6c216 Mon Sep 17 00:00:00 2001 From: MasahideHayashi Date: Thu, 2 Oct 2025 14:13:11 +0900 Subject: [PATCH 03/16] 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 f36efcbe0c55adc387fe6d6d9010fd67a3490b9e Mon Sep 17 00:00:00 2001 From: MasahideHayashi Date: Thu, 2 Oct 2025 14:19:51 +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 bf6eb1fd541fc25d224ece3445d9de992768dda9 Mon Sep 17 00:00:00 2001 From: MasahideHayashi Date: Thu, 2 Oct 2025 14:21:56 +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 d89001a3232727ce3380cd74980fc8f62f25485e Mon Sep 17 00:00:00 2001 From: MasahideHayashi Date: Thu, 2 Oct 2025 14:23:11 +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 6e4e6f8f7187a798378c474c0f69cd73c206f906 Mon Sep 17 00:00:00 2001 From: MasahideHayashi Date: Thu, 2 Oct 2025 14:36:32 +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 f75986aecbcbb8d80d18c0824dc0d3ac16c6c9a0 Mon Sep 17 00:00:00 2001 From: MasahideHayashi Date: Mon, 6 Oct 2025 19:36:08 +0900 Subject: [PATCH 08/16] new feature commit --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e05b801e5..bb132e696 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ # git-practice このリポジトリはGit動画講座用です． -ローカルリポで変更 \ No newline at end of file +ローカルリポで変更 + +new-featureブランチで変更 \ No newline at end of file From 99d6a0d5aa8bbf308aaffc102f594aaed783fe69 Mon Sep 17 00:00:00 2001 From: MasahideHayashi Date: Mon, 6 Oct 2025 19:47:30 +0900 Subject: [PATCH 09/16] automatic merge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bb132e696..37f05b75b 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,4 @@ このリポジトリはGit動画講座用です． ローカルリポで変更 -new-featureブランチで変更 \ No newline at end of file +no-fast-forwartブランチで変更 \ No newline at end of file From 018cb858caa988b70466dfb35a7f8dbc09b1fc75 Mon Sep 17 00:00:00 2001 From: MasahideHayashi Date: Mon, 6 Oct 2025 19:49:32 +0900 Subject: [PATCH 10/16] make new file on 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..cea55e870 --- /dev/null +++ b/newfile.txt @@ -0,0 +1 @@ +created new file \ No newline at end of file From 67796c11c122251ad31df55168ce13814663d0c9 Mon Sep 17 00:00:00 2001 From: MasahideHayashi Date: Mon, 6 Oct 2025 20:02:28 +0900 Subject: [PATCH 11/16] conflict update --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 37f05b75b..20d4ec5b3 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,4 @@ このリポジトリはGit動画講座用です． ローカルリポで変更 -no-fast-forwartブランチで変更 \ No newline at end of file +conflictブランチで変更 \ No newline at end of file From e7970310abc5ec0aa00e35f103b8d58586d7c422 Mon Sep 17 00:00:00 2001 From: MasahideHayashi Date: Mon, 6 Oct 2025 20:04:07 +0900 Subject: [PATCH 12/16] update readme on main --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 37f05b75b..6118fd1a8 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,4 @@ このリポジトリはGit動画講座用です． ローカルリポで変更 -no-fast-forwartブランチで変更 \ No newline at end of file +mainブランチで変更 \ No newline at end of file From 6653f0cb26b4c225b9cc65c9cabb0cf5e3e3f3a4 Mon Sep 17 00:00:00 2001 From: MasahideHayashi <85610202+MasahideHayashi@users.noreply.github.com> Date: Sun, 12 Oct 2025 03:23:00 +0900 Subject: [PATCH 13/16] Update README to reflect changes on GitHub --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d1fcddb6a..5b654ff72 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -conflictブランチで変更 +github上で更新 From e21d5713ffebf244aa8e010c68810c6bb20c9c11 Mon Sep 17 00:00:00 2001 From: MasahideHayashi <85610202+MasahideHayashi@users.noreply.github.com> Date: Sun, 12 Oct 2025 03:31:43 +0900 Subject: [PATCH 14/16] Update README to include 'kousinn' in update note --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5b654ff72..fcb8a0550 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -github上で更新 +github上で更新 kousinn From 0edf8d570f83ce50f8380134089a5963fad9bb90 Mon Sep 17 00:00:00 2001 From: MasahideHayashi Date: Sun, 12 Oct 2025 03:32:55 +0900 Subject: [PATCH 15/16] update README on conflict-remote branch --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5b654ff72..27eca28bb 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -github上で更新 +conflict-remote上で更新 From 0d79a51c1de0ffa18d1f8a978781324ef5a1b1a3 Mon Sep 17 00:00:00 2001 From: MasahideHayashi Date: Sun, 12 Oct 2025 03:59:28 +0900 Subject: [PATCH 16/16] new-feature commit --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 324ee0691..41714aff4 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． -ローカルリポで変更 -conflict-remote上で更新 - +自分のリポジトリで更新 \ No newline at end of file