From b4ec24833e0003f9b142a6223b68d4a397134bd3 Mon Sep 17 00:00:00 2001 From: ciaokojiro Date: Tue, 12 Aug 2025 23:47:19 -0400 Subject: [PATCH 01/18] reset from scratch --- README.md | 1 + delete_soon.txt | 0 namechanged2.txt | 1 + output.log | 0 4 files changed, 2 insertions(+) create mode 100644 delete_soon.txt create mode 100644 namechanged2.txt create mode 100644 output.log 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/delete_soon.txt b/delete_soon.txt new file mode 100644 index 000000000..e69de29bb diff --git a/namechanged2.txt b/namechanged2.txt new file mode 100644 index 000000000..99c7b7d92 --- /dev/null +++ b/namechanged2.txt @@ -0,0 +1 @@ +newfile作成 \ No newline at end of file diff --git a/output.log b/output.log new file mode 100644 index 000000000..e69de29bb From ead40472f0039daa457cdd4d899d16966dbf10c8 Mon Sep 17 00:00:00 2001 From: ciaokojiro Date: Thu, 14 Aug 2025 00:54:55 -0400 Subject: [PATCH 02/18] update readme --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e05b801e5..0c3597344 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 bcecf658ea76f30c430d96f9f65d646f3508a8b5 Mon Sep 17 00:00:00 2001 From: ciaokojiro Date: Sat, 16 Aug 2025 18:45:54 -0400 Subject: [PATCH 03/18] 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 90e20f0d6b496bcd35165528359ac9e682c173ef Mon Sep 17 00:00:00 2001 From: ciaokojiro Date: Sat, 16 Aug 2025 18:58:58 -0400 Subject: [PATCH 04/18] make new 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 7ce1ca9de61623e4def83b3a0d62e0e4762853e8 Mon Sep 17 00:00:00 2001 From: ciaokojiro Date: Sat, 16 Aug 2025 19:02:28 -0400 Subject: [PATCH 05/18] delete newfile --- 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 99c7b7d92..000000000 --- a/newfile.txt +++ /dev/null @@ -1 +0,0 @@ -newfile作成 \ No newline at end of file From b905b4cb046f0362e451db836edcb9b1be733142 Mon Sep 17 00:00:00 2001 From: ciaokojiro Date: Sat, 16 Aug 2025 19:03:20 -0400 Subject: [PATCH 06/18] added txt again --- 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 85bf58b02bdc526a59ff0371f14f46d159a5164b Mon Sep 17 00:00:00 2001 From: ciaokojiro Date: Sat, 16 Aug 2025 19:04:32 -0400 Subject: [PATCH 07/18] delete output --- output.log | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 output.log diff --git a/output.log b/output.log deleted file mode 100644 index e69de29bb..000000000 From 8d186c8e2e6b98b8323251b2dab3f4f0c6663caf Mon Sep 17 00:00:00 2001 From: ciaokojiro Date: Sat, 16 Aug 2025 19:07:26 -0400 Subject: [PATCH 08/18] commit 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 a848c58ceb2529b14f7c62bd52753ccdc2993dde Mon Sep 17 00:00:00 2001 From: ciaokojiro Date: Sat, 16 Aug 2025 19:17:36 -0400 Subject: [PATCH 09/18] update readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0c3597344..6e5e3e644 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． -ローカルリポで変更　 -new-featureブランチで変更 \ No newline at end of file +ローカルリポで変更 +new-featureブランチで 変更 \ No newline at end of file From 5f9ffc49062ae4c2dece0bb48497303dc970c76d Mon Sep 17 00:00:00 2001 From: ciaokojiro Date: Sat, 16 Aug 2025 19:48:44 -0400 Subject: [PATCH 10/18] update readme for automatic merge --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6e5e3e644..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 7143a6fe372219ba88e416f107dba48c6b1e7ff9 Mon Sep 17 00:00:00 2001 From: ciaokojiro Date: Sat, 16 Aug 2025 19:50:24 -0400 Subject: [PATCH 11/18] 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..3a63a982e --- /dev/null +++ b/newfile.txt @@ -0,0 +1 @@ +created new file!! \ No newline at end of file From 61f0baf7944f9e306fd30b20027c3d9f60309f85 Mon Sep 17 00:00:00 2001 From: ciaokojiro Date: Sat, 16 Aug 2025 20:24:44 -0400 Subject: [PATCH 12/18] update readme on conflict branch for conflict --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 76afd9a52..ecfd1805c 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 6a3d199508924bd383f6f358ba4383d824564484 Mon Sep 17 00:00:00 2001 From: ciaokojiro Date: Sat, 16 Aug 2025 20:27:15 -0400 Subject: [PATCH 13/18] 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 76afd9a52..1693dc4f6 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -no-fast-forwardブランチで変更 \ No newline at end of file +mainブランチで変更(コンフリクト発生) From bf4aa75cda8953307e3eab2dbe737df157e0bc47 Mon Sep 17 00:00:00 2001 From: kojiroinusa <64342353+ciaokojiro@users.noreply.github.com> Date: Sun, 17 Aug 2025 01:27:21 -0400 Subject: [PATCH 14/18] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d1fcddb6a..0da7945c6 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -conflictブランチで変更 +conflictブランチで更新 From 357c5307605b1a7e08c6e4c5a0adf3acc8b70c54 Mon Sep 17 00:00:00 2001 From: kojiroinusa <64342353+ciaokojiro@users.noreply.github.com> Date: Mon, 18 Aug 2025 06:55:16 -0400 Subject: [PATCH 15/18] 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 0da7945c6..1c29b288e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -conflictブランチで更新 +GitHubで更新二回目 From 8c6c26e24590b8814840b86656f897db5cbf1b24 Mon Sep 17 00:00:00 2001 From: ciaokojiro Date: Mon, 18 Aug 2025 06:56:56 -0400 Subject: [PATCH 16/18] update readme on confclit-remote --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0da7945c6..e603766a3 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -conflictブランチで更新 +conflict-remote上で更新（コンフリクト反省） From 4bfdad17fda4ad5a30f9d1720c21ffa5b96ade17 Mon Sep 17 00:00:00 2001 From: ciaokojiro Date: Mon, 18 Aug 2025 06:58:59 -0400 Subject: [PATCH 17/18] again --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e603766a3..990ce999a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -conflict-remote上で更新（コンフリクト反省） +conflict-remote上で更新（コンフリクト発生） From 87e6aacd2fd6c34a78b5840a1587c327cb63d8ca Mon Sep 17 00:00:00 2001 From: ciaokojiro Date: Sun, 24 Aug 2025 23:54:10 -0400 Subject: [PATCH 18/18] update readme at my repo --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 990ce999a..41714aff4 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． -ローカルリポで変更 -conflict-remote上で更新（コンフリクト発生） +自分のリポジトリで更新 \ No newline at end of file