From 1924dd67fb2ff94d23bb2bab0b4a2c306caf1adb Mon Sep 17 00:00:00 2001 From: monacomoo Date: Fri, 30 May 2025 01:39:33 +0900 Subject: [PATCH 01/21] 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..49ba5e4e8 --- /dev/null +++ b/newfile.txt @@ -0,0 +1 @@ +newfile作成 From 07658e008968b365f95661f35476bfcbdad5a754 Mon Sep 17 00:00:00 2001 From: monacomoo Date: Sun, 1 Jun 2025 01:17:52 +0900 Subject: [PATCH 02/21] 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 0893a9a3bd077b9ab6f01d02d17eaab7eea4108a Mon Sep 17 00:00:00 2001 From: monacomoo Date: Sun, 1 Jun 2025 01:23:15 +0900 Subject: [PATCH 03/21] change name again --- README.md | 3 ++- namechanged.txt => namechanged2.txt | 0 2 files changed, 2 insertions(+), 1 deletion(-) rename namechanged.txt => namechanged2.txt (100%) diff --git a/README.md b/README.md index 9e7d03700..002281ef1 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,3 @@ # git-practice -このリポジトリはGit動画講座用です． +このリポジトリはGit動画講座用です. +ローカルリポで変更 diff --git a/namechanged.txt b/namechanged2.txt similarity index 100% rename from namechanged.txt rename to namechanged2.txt From 2bd99d026fe47e9a4f60c245133074be60855068 Mon Sep 17 00:00:00 2001 From: monacomoo Date: Sun, 1 Jun 2025 01:33:44 +0900 Subject: [PATCH 04/21] 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 248152b2d9e513cde8efcbd0e67e60effbd5a3c2 Mon Sep 17 00:00:00 2001 From: monacomoo Date: Sun, 1 Jun 2025 01:34:59 +0900 Subject: [PATCH 05/21] 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 6ad7e93dbe0794dbf427bede44b2ed0ca5f245c7 Mon Sep 17 00:00:00 2001 From: monacomoo Date: Sun, 1 Jun 2025 01:36:40 +0900 Subject: [PATCH 06/21] 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 6ba31aeef564d95dcb7fe85280f09653016feed7 Mon Sep 17 00:00:00 2001 From: monacomoo Date: Sun, 1 Jun 2025 01:56:45 +0900 Subject: [PATCH 07/21] 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..9aa6a64e3 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +output.log From b5f3cad4a3cdca851cf0ba91e4131f30e48f2457 Mon Sep 17 00:00:00 2001 From: monacomoo Date: Sun, 1 Jun 2025 12:10:04 +0900 Subject: [PATCH 08/21] update README --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 002281ef1..d25752c7a 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ # git-practice このリポジトリはGit動画講座用です. -ローカルリポで変更 +ローカルリポで変更 +new-featureブランチで変更 From 8b2cce29c2757bb3140a903ba4b9426fd2d0937e Mon Sep 17 00:00:00 2001 From: monacomoo Date: Sun, 1 Jun 2025 13:32:34 +0900 Subject: [PATCH 09/21] update readme for automatic merge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d25752c7a..bd3a04d70 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です. ローカルリポで変更 -new-featureブランチで変更 +no-fast-forwardで変更 From 693ecb7962a61913c54e34262c61addc90f95b5e Mon Sep 17 00:00:00 2001 From: monacomoo Date: Sun, 1 Jun 2025 13:39:19 +0900 Subject: [PATCH 10/21] 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..529d21177 --- /dev/null +++ b/newfile.txt @@ -0,0 +1 @@ +created new file From 6b67c3b41b6fd2bd78b3912ee955578518acdce0 Mon Sep 17 00:00:00 2001 From: monacomoo Date: Sun, 1 Jun 2025 13:58:37 +0900 Subject: [PATCH 11/21] update readme on conflict branch --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bd3a04d70..8522bac79 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です. ローカルリポで変更 -no-fast-forwardで変更 +conflictブランチで変（コンフリクト発生） From 4191c8e00bd2cd24f4e00159d93725346d3df7c1 Mon Sep 17 00:00:00 2001 From: monacomoo Date: Sun, 1 Jun 2025 14:01:29 +0900 Subject: [PATCH 12/21] update readme on main for conflict --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bd3a04d70..e2dd733f5 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です. ローカルリポで変更 -no-fast-forwardで変更 +mainで変更（コンフリクト発生） From 1e7b92a624da0c92a2534bfa606856ac48010f73 Mon Sep 17 00:00:00 2001 From: monacomoo Date: Sun, 1 Jun 2025 14:11:42 +0900 Subject: [PATCH 13/21] modify comment --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8522bac79..f8f1117f1 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です. ローカルリポで変更 -conflictブランチで変（コンフリクト発生） +conflictブランチで変更（コンフリクト発生） From aeb9cee23dc3f5ea9b5c1ed6b3e0836ad21021b6 Mon Sep 17 00:00:00 2001 From: monacomoo <145216621+monacomoo@users.noreply.github.com> Date: Mon, 2 Jun 2025 01:37:53 +0900 Subject: [PATCH 14/21] Update README.md on Github --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f8f1117f1..cd9db3701 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です. ローカルリポで変更 -conflictブランチで変更（コンフリクト発生） +Github上で変更 From 82a6ee1cb2673ba209bc0aeb02a7ebc2eec8d8f8 Mon Sep 17 00:00:00 2001 From: monacomoo <145216621+monacomoo@users.noreply.github.com> Date: Mon, 2 Jun 2025 02:01:41 +0900 Subject: [PATCH 15/21] 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 cd9db3701..e33df6be6 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です. ローカルリポで変更 -Github上で変更 +Github上で変更（２回目） From fee573f6ca47e28255de489b18fc7c3d70e73b98 Mon Sep 17 00:00:00 2001 From: monacomoo Date: Mon, 2 Jun 2025 02:04:27 +0900 Subject: [PATCH 16/21] 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 cd9db3701..1e1ca0175 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です. ローカルリポで変更 -Github上で変更 +conflict-remote上で更新（コンフリクト発生） From 289dbdc711d4a2c912bb9dca0572f475e39eeb36 Mon Sep 17 00:00:00 2001 From: monacomoo Date: Sat, 7 Jun 2025 15:36:21 +0900 Subject: [PATCH 17/21] make new file on main --- another_file.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 another_file.txt diff --git a/another_file.txt b/another_file.txt new file mode 100644 index 000000000..606cc5df2 --- /dev/null +++ b/another_file.txt @@ -0,0 +1 @@ +新しいファイルをmainブランチで作成 From f44adb487a1a26e15deb5ce484622baa826641c1 Mon Sep 17 00:00:00 2001 From: monacomoo Date: Sat, 7 Jun 2025 15:30:12 +0900 Subject: [PATCH 18/21] update readme on rebae-practice --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8b3d47177..4789428af 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です. ローカルリポで変更 -conflict-remote上で更新（コンフリクト発生） \ No newline at end of file +rebase-practiceで更新（rebase用） \ No newline at end of file From 64ff19f1e87631a3126bdb6ffeba1d6f110e5f56 Mon Sep 17 00:00:00 2001 From: monacomoo Date: Sat, 7 Jun 2025 20:27:39 +0900 Subject: [PATCH 19/21] uodate readme on main for conflict --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4789428af..f9a2a849a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です. ローカルリポで変更 -rebase-practiceで更新（rebase用） \ No newline at end of file +mainで更新（rebaseコンフリクト用用） \ No newline at end of file From 9ee1760eaf8d7eaa7c39779b5d686945213c4a35 Mon Sep 17 00:00:00 2001 From: monacomoo Date: Sat, 7 Jun 2025 20:24:16 +0900 Subject: [PATCH 20/21] update readme on rebase-practice for conflict --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f9a2a849a..c63db7304 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です. ローカルリポで変更 -mainで更新（rebaseコンフリクト用用） \ No newline at end of file +rebase-practiceで更新（rebase コンフリクト用用） From e5c8fd2fe012746d16b9491b9b06a1cd42a6900f Mon Sep 17 00:00:00 2001 From: monacomoo <145216621+monacomoo@users.noreply.github.com> Date: Sat, 7 Jun 2025 22:03:51 +0900 Subject: [PATCH 21/21] Update readme for rebase pull --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c63db7304..fefd5bd7d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ # git-practice このリポジトリはGit動画講座用です. ローカルリポで変更 -rebase-practiceで更新（rebase コンフリクト用用） +rebase-practiceで更新（rebase コンフリクト用） +rebase pull用