From 2a615d1f95ecf2707c3ad1d71790d60d9e99bdbf Mon Sep 17 00:00:00 2001 From: yuki85v Date: Sat, 14 Jun 2025 21:19:00 +0900 Subject: [PATCH 01/16] add newfile --- newfiles.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 newfiles.txt diff --git a/newfiles.txt b/newfiles.txt new file mode 100644 index 000000000..99c7b7d92 --- /dev/null +++ b/newfiles.txt @@ -0,0 +1 @@ +newfile作成 \ No newline at end of file From 479e8664f61102716f141f99056b672f075b683e Mon Sep 17 00:00:00 2001 From: yuki85v Date: Sat, 14 Jun 2025 21:40:41 +0900 Subject: [PATCH 02/16] cahnge name --- newfiles.txt => namechanged.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename newfiles.txt => namechanged.txt (100%) diff --git a/newfiles.txt b/namechanged.txt similarity index 100% rename from newfiles.txt rename to namechanged.txt From 2f8c50c6ce591990ff863e6fce59b818ae1d490d Mon Sep 17 00:00:00 2001 From: yuki85v Date: Sat, 14 Jun 2025 21:45:57 +0900 Subject: [PATCH 03/16] change name again --- README.md | 2 ++ namechanged.txt => namechanged2.txt | 0 2 files changed, 2 insertions(+) rename namechanged.txt => namechanged2.txt (100%) diff --git a/README.md b/README.md index 9e7d03700..fce9ada18 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,4 @@ # 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 aba83d10db9da9b978397036cfcf1de70d959bb2 Mon Sep 17 00:00:00 2001 From: yuki85v Date: Sat, 14 Jun 2025 21:55:57 +0900 Subject: [PATCH 04/16] make new file2 --- 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 05976d1ec0a244f86cb0959020c4376c0ce6236a Mon Sep 17 00:00:00 2001 From: yuki85v Date: Sat, 14 Jun 2025 21:58:01 +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 97afd8d68e9c788532b58d6ce4aac023cd277aad Mon Sep 17 00:00:00 2001 From: yuki85v Date: Sat, 14 Jun 2025 21:59:57 +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 d492bf8269c142b09875936c3b35ff9a6f00708d Mon Sep 17 00:00:00 2001 From: yuki85v Date: Sat, 14 Jun 2025 22:30:39 +0900 Subject: [PATCH 07/16] git ignore --- .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 1ab55026aa9e346f720da72ebad0007447892eff Mon Sep 17 00:00:00 2001 From: yuki85v Date: Sun, 15 Jun 2025 08:43:19 +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 fce9ada18..ceee512f3 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ # git-practice このリポジトリはGit動画講座用です． -ローカルリポで変更 \ No newline at end of file +ローカルリポで変更 +new-featureブランチで変更 \ No newline at end of file From a047be7fa596afe08540746356d3789b37772982 Mon Sep 17 00:00:00 2001 From: yuki85v Date: Sun, 15 Jun 2025 16:12:15 +0900 Subject: [PATCH 09/16] update readme for automatic merge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ceee512f3..30819be24 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,4 @@ このリポジトリはGit動画講座用です． ローカルリポで変更 -new-featureブランチで変更 \ No newline at end of file +no-fast-forwardブランチで変更 \ No newline at end of file From 607bd8f88ce1f0a1c3b11a895bef0bb6626c3b54 Mon Sep 17 00:00:00 2001 From: yuki85v Date: Sun, 15 Jun 2025 16:15:44 +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..cfe3bf1f3 --- /dev/null +++ b/newfile.txt @@ -0,0 +1 @@ +created new file!!! \ No newline at end of file From 130406fa9e28360468ae6cdb49c8cb87117f7ae7 Mon Sep 17 00:00:00 2001 From: yuki85v Date: Sun, 15 Jun 2025 16:31:27 +0900 Subject: [PATCH 11/16] update readme on cnflict branch for conflict --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 30819be24..8c1e5ba93 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,4 @@ このリポジトリはGit動画講座用です． ローカルリポで変更 -no-fast-forwardブランチで変更 \ No newline at end of file +conflictブランチで変更 \ No newline at end of file From 7a5f56a9d9010f759be4fa6b3101fc3aff90caff Mon Sep 17 00:00:00 2001 From: yuki85v Date: Sun, 15 Jun 2025 16:33:28 +0900 Subject: [PATCH 12/16] 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 30819be24..0370c7a6f 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,4 @@ このリポジトリはGit動画講座用です． ローカルリポで変更 -no-fast-forwardブランチで変更 \ No newline at end of file +mainブランチで変更(コンフリクト発生) \ No newline at end of file From 9bd9897a0fc39bd5b4e4c183ee96a952dcd886d3 Mon Sep 17 00:00:00 2001 From: yuki85v <83193158+yuki85v@users.noreply.github.com> Date: Sun, 15 Jun 2025 16:54:26 +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 94e79cd1c..e57766792 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # git-practice このリポジトリはGit動画講座用です． - ローカルリポで変更 conflictブランチで変更 +Github上で更新 From 520ae3b0a90b7db7c3a891c6acfad6ada61f3266 Mon Sep 17 00:00:00 2001 From: yuki85v <83193158+yuki85v@users.noreply.github.com> Date: Sun, 15 Jun 2025 17:07:11 +0900 Subject: [PATCH 14/16] 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 e57766792..41ce41dd3 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,4 @@ このリポジトリはGit動画講座用です． ローカルリポで変更 conflictブランチで変更 -Github上で更新 +Github上で更新2回目 From 4ef4d258930ff2adc0d466ac4804fbd6114aead2 Mon Sep 17 00:00:00 2001 From: yuki85v Date: Sun, 15 Jun 2025 17:08:35 +0900 Subject: [PATCH 15/16] 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 e57766792..51f18aae4 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,4 @@ このリポジトリはGit動画講座用です． ローカルリポで変更 conflictブランチで変更 -Github上で更新 +conflict-remote上で更新(コンフリクト発生) From a6de9ec3b4261c33b808175305c1e314476d112c Mon Sep 17 00:00:00 2001 From: yuki85v Date: Sun, 15 Jun 2025 20:12:21 +0900 Subject: [PATCH 16/16] update readme at my repo --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 863dd8008..0fabd0cda 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． -ローカルリポで変更 -conflictブランチで変更 -conflict-remote上で更新(コンフリクト発生) \ No newline at end of file +自分のレポジトリで更新 \ No newline at end of file