From 04e051305cefa0e89c9d1f604a52182bd101597f Mon Sep 17 00:00:00 2001 From: T4ge0 Date: Thu, 5 Feb 2026 18:24:15 +0900 Subject: [PATCH 01/16] 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 7111099f894e1306d400df5a9ce170a45170ca9d Mon Sep 17 00:00:00 2001 From: T4ge0 Date: Fri, 6 Feb 2026 14:28:01 +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 a059b43288cb40f4796c9099cd9d202c1025d795 Mon Sep 17 00:00:00 2001 From: T4ge0 Date: Fri, 6 Feb 2026 14:31:49 +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 97c89f822b9748ff30d3f1d3cc17da8a4565af0e Mon Sep 17 00:00:00 2001 From: T4ge0 Date: Fri, 6 Feb 2026 14:38:51 +0900 Subject: [PATCH 04/16] make newfile --- 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 a81ac72f00e8cd2433004878066afa71517ebf44 Mon Sep 17 00:00:00 2001 From: T4ge0 Date: Fri, 6 Feb 2026 14:39:38 +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 bc507040a512e81049c1ba0bafdce117aab9b1b0 Mon Sep 17 00:00:00 2001 From: T4ge0 Date: Fri, 6 Feb 2026 14:40:43 +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 4a7f25fa0e7761c396fc683b2675caa5fe2d76b2 Mon Sep 17 00:00:00 2001 From: T4ge0 Date: Fri, 6 Feb 2026 14:52:47 +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 d091f00862a8fe029b9820ac282c77c6e3cdae86 Mon Sep 17 00:00:00 2001 From: T4ge0 Date: Sun, 8 Feb 2026 18:53:36 +0900 Subject: [PATCH 08/16] update README --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e05b801e5..75ea51dd0 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 a7cf6393b69e44590a94f46d3b0849e3bf390ec0 Mon Sep 17 00:00:00 2001 From: T4ge0 Date: Tue, 10 Feb 2026 18:26:11 +0900 Subject: [PATCH 09/16] update readme for nofastforward --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 75ea51dd0..76afd9a52 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 caf69cd7d8a02030331668b7fb8d3f8d190c12d0 Mon Sep 17 00:00:00 2001 From: T4ge0 Date: Tue, 10 Feb 2026 18:29:23 +0900 Subject: [PATCH 10/16] 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..8c967dfd9 --- /dev/null +++ b/newfile.txt @@ -0,0 +1 @@ +create new file \ No newline at end of file From 02375eae89a5c04c94fcca9055d6590701712b09 Mon Sep 17 00:00:00 2001 From: T4ge0 Date: Tue, 10 Feb 2026 18:52:00 +0900 Subject: [PATCH 11/16] update readme for conflict --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 76afd9a52..5cb35d8ef 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 eaeaa94a0d2e9dfbd41ef9cd0fcd70a6cd733a50 Mon Sep 17 00:00:00 2001 From: T4ge0 Date: Tue, 10 Feb 2026 18:53:32 +0900 Subject: [PATCH 12/16] update readme for main conflict --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 76afd9a52..29dc22671 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 2d4b8bb1e5383122734b90ea8801a05408a40296 Mon Sep 17 00:00:00 2001 From: T4ge0 <122782709+T4ge0@users.noreply.github.com> Date: Thu, 12 Feb 2026 18:05:17 +0900 Subject: [PATCH 13/16] Update README.md on GitHub --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5a31b19c5..cad4d7da3 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -conflictブランチで変更（コンフリクト発生） +githubで変更 From 7da478998a311edc8b7c5acbbe56a862cc0bb1c7 Mon Sep 17 00:00:00 2001 From: T4ge0 <122782709+T4ge0@users.noreply.github.com> Date: Thu, 12 Feb 2026 18:15:14 +0900 Subject: [PATCH 14/16] Update README.md on github conflict --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cad4d7da3..c0a9aa2af 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -githubで変更 +githubで変更2回目 From e93977821eed1c30a5880c7181c33cb85364e565 Mon Sep 17 00:00:00 2001 From: T4ge0 Date: Thu, 12 Feb 2026 18:16:20 +0900 Subject: [PATCH 15/16] update readme on remote conflict --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cad4d7da3..ae4c10cbb 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -githubで変更 +conflict-remoteで変更conflict発生 From b4c879af21ccef2cc6781c516bbb2d3892452213 Mon Sep 17 00:00:00 2001 From: T4ge0 Date: Thu, 12 Feb 2026 18:39:10 +0900 Subject: [PATCH 16/16] update on new-feature --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index ae4c10cbb..7acb31490 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． -ローカルリポで変更 -conflict-remoteで変更conflict発生 +自分のrepoで変更