From b51446a34bb90319eb882089528ad4e7e5eb832e Mon Sep 17 00:00:00 2001 From: kenta0831 Date: Sun, 5 Oct 2025 20:35:29 +0900 Subject: [PATCH 01/19] 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 71e66906ad8794663eae8a3ec5cd79aa7b3c3026 Mon Sep 17 00:00:00 2001 From: kenta0831 Date: Sun, 5 Oct 2025 21:12:28 +0900 Subject: [PATCH 02/19] 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 5e8f77b198f27839db519dbe380c5fbd8aaeaf41 Mon Sep 17 00:00:00 2001 From: kenta0831 Date: Sun, 5 Oct 2025 21:15:52 +0900 Subject: [PATCH 03/19] 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 4e8d23b23b3bf4591e81bbb12c758cfcba0f6524 Mon Sep 17 00:00:00 2001 From: kenta0831 Date: Sun, 5 Oct 2025 21:25:28 +0900 Subject: [PATCH 04/19] 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 a596505f04988b4f4200368432315da7e5eb096d Mon Sep 17 00:00:00 2001 From: kenta0831 Date: Sun, 5 Oct 2025 21:27:18 +0900 Subject: [PATCH 05/19] 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 6c13be4fb6bc7e9dabb17665697e5bccb7fe0967 Mon Sep 17 00:00:00 2001 From: kenta0831 Date: Sun, 5 Oct 2025 21:28:44 +0900 Subject: [PATCH 06/19] 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 86d73f7cb14dc3db49f2d7451810bf5258580c50 Mon Sep 17 00:00:00 2001 From: kenta0831 Date: Sun, 5 Oct 2025 21:45:54 +0900 Subject: [PATCH 07/19] 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 c88106ee231098d2d33227eb6b9ae6ae8c8d39eb Mon Sep 17 00:00:00 2001 From: kenta0831 Date: Mon, 6 Oct 2025 11:36:50 +0900 Subject: [PATCH 08/19] update readme --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e05b801e5..d53152b7e 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 bd91a9ac09b30442a040868959c43bac80b0dfbc Mon Sep 17 00:00:00 2001 From: kenta0831 Date: Mon, 6 Oct 2025 11:56:45 +0900 Subject: [PATCH 09/19] make newfile 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..997242550 --- /dev/null +++ b/newfile.txt @@ -0,0 +1 @@ +create new file!! \ No newline at end of file From 2f7c2b64ed23e24802e25dbfe61ec83bd886d423 Mon Sep 17 00:00:00 2001 From: kenta0831 Date: Mon, 6 Oct 2025 12:11:27 +0900 Subject: [PATCH 10/19] remove newfile.txt --- newfile.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 newfile.txt diff --git a/newfile.txt b/newfile.txt deleted file mode 100644 index 997242550..000000000 --- a/newfile.txt +++ /dev/null @@ -1 +0,0 @@ -create new file!! \ No newline at end of file From 30357be43c73413f809afcaf216e9d6c3c5b76ab Mon Sep 17 00:00:00 2001 From: kenta0831 Date: Mon, 6 Oct 2025 12:15:08 +0900 Subject: [PATCH 11/19] update readme for automatic merge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d53152b7e..a7913c845 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 0811274db585480579c8f45f8b8057d9e1595b27 Mon Sep 17 00:00:00 2001 From: kenta0831 Date: Mon, 6 Oct 2025 12:16:47 +0900 Subject: [PATCH 12/19] make newfile for automatic merch --- 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 85c7ee3548e81b759f9667ce7c1ac52bac7405e5 Mon Sep 17 00:00:00 2001 From: kenta0831 Date: Mon, 6 Oct 2025 12:28:40 +0900 Subject: [PATCH 13/19] update readme on conflict-branch --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a7913c845..f56967069 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 223838d4c362945054d5b56b9837df14c9d4546d Mon Sep 17 00:00:00 2001 From: kenta0831 Date: Mon, 6 Oct 2025 12:30:42 +0900 Subject: [PATCH 14/19] update readme on main --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a7913c845..5cf589bc4 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 c302a0de501083d17c627b89b2bf87333b2a0b51 Mon Sep 17 00:00:00 2001 From: kenta0831 Date: Mon, 6 Oct 2025 14:33:08 +0900 Subject: [PATCH 15/19] Update readme on github. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9b67510d0..c2315b5bf 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -conflictブランチで変更(コンフリクト発生) +Github上で更新 From bafc18b9a4301868faaf7fc1b306ba8126cbd0d1 Mon Sep 17 00:00:00 2001 From: kenta0831 Date: Mon, 6 Oct 2025 14:47:35 +0900 Subject: [PATCH 16/19] update readme on github for conflict. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c2315b5bf..03f43f81e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -Github上で更新 +Github上で更新(編集) From 234e5556f7d138e772fc8bb0cedc5dcf99f4d37d Mon Sep 17 00:00:00 2001 From: kenta0831 Date: Mon, 6 Oct 2025 15:00:01 +0900 Subject: [PATCH 17/19] update readme on github for conflict2 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 03f43f81e..cc8a52e65 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -Github上で更新(編集) +Github上で更新(conflict発生) From 088ff3838bd1e3056aaadc84b1e814af7093cc5d Mon Sep 17 00:00:00 2001 From: kenta0831 Date: Mon, 6 Oct 2025 15:04:04 +0900 Subject: [PATCH 18/19] 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 03f43f81e..2f215ca51 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -Github上で更新(編集) +conflict-remote上で更新(conflict発生) From 40e626702fdf4ee8d8d9eb9d61a4b83c77526923 Mon Sep 17 00:00:00 2001 From: kenta0831 Date: Mon, 6 Oct 2025 16:51:19 +0900 Subject: [PATCH 19/19] update readme at my repo --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 2f215ca51..41714aff4 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． -ローカルリポで変更 -conflict-remote上で更新(conflict発生) +自分のリポジトリで更新 \ No newline at end of file