From f552582ac39e0af6e522af5e7e134fe62867f29e Mon Sep 17 00:00:00 2001 From: nyuki0821 Date: Sat, 28 Dec 2024 15:10:12 +0900 Subject: [PATCH 01/17] 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..4d884d787 --- /dev/null +++ b/newfile.txt @@ -0,0 +1 @@ +create newfile \ No newline at end of file From 0e14a9ff02097e6e285d1aa5061553b8bacebdba Mon Sep 17 00:00:00 2001 From: nyuki0821 Date: Sat, 28 Dec 2024 15:44:38 +0900 Subject: [PATCH 02/17] 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 449dd6e638264cded631966667952c1e7575cfbf Mon Sep 17 00:00:00 2001 From: nyuki0821 Date: Sat, 28 Dec 2024 15:49:15 +0900 Subject: [PATCH 03/17] change commit 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 afdcac69aa373e6a9668f431f52c9bbd6af66f13 Mon Sep 17 00:00:00 2001 From: nyuki0821 Date: Sat, 28 Dec 2024 16:23:09 +0900 Subject: [PATCH 04/17] 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 6d00289113f0cdf081dc6a7de2c06e0108e19df3 Mon Sep 17 00:00:00 2001 From: nyuki0821 Date: Sat, 28 Dec 2024 16:24:46 +0900 Subject: [PATCH 05/17] 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 308da2a7e9f20e15f6e5627649d5f75f6b1ef9ee Mon Sep 17 00:00:00 2001 From: nyuki0821 Date: Sat, 28 Dec 2024 16:27:06 +0900 Subject: [PATCH 06/17] 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 fce2fb3fd327df3027a90f04cf7664eafa70b1d6 Mon Sep 17 00:00:00 2001 From: nyuki0821 Date: Sat, 28 Dec 2024 16:44:47 +0900 Subject: [PATCH 07/17] 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 2ac14b7f3a96372bf47d790ec97859c75abd5d6c Mon Sep 17 00:00:00 2001 From: nyuki0821 Date: Sat, 28 Dec 2024 21:39:49 +0900 Subject: [PATCH 08/17] update readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index fce9ada18..d53152b7e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． - -ローカルリポで変更 \ No newline at end of file +ローカルリポで変更 +new-featureブランチで変更 \ No newline at end of file From be3b330c23ce4c738dfe55253ed0dfcc11c49565 Mon Sep 17 00:00:00 2001 From: nyuki0821 Date: Sat, 28 Dec 2024 22:29:30 +0900 Subject: [PATCH 09/17] 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 58783be7e494504330b53602c6bb38bcb1860b23 Mon Sep 17 00:00:00 2001 From: nyuki0821 Date: Sat, 28 Dec 2024 22:33:01 +0900 Subject: [PATCH 10/17] 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 a26fbc1364b3ca2041f5300aeecf0da674ecfd9e Mon Sep 17 00:00:00 2001 From: nyuki0821 Date: Sat, 28 Dec 2024 23:06:40 +0900 Subject: [PATCH 11/17] 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 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 11ba488b80d330f902dba245805eafb59a895354 Mon Sep 17 00:00:00 2001 From: nyuki0821 Date: Sat, 28 Dec 2024 23:08:42 +0900 Subject: [PATCH 12/17] update readme on main branch for conflict --- 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 e56b33a37de7486c32ff5e83d707e475aa00e8b6 Mon Sep 17 00:00:00 2001 From: nyuki0821 <107778378+nyuki0821@users.noreply.github.com> Date: Sun, 29 Dec 2024 08:23:53 +0900 Subject: [PATCH 13/17] Update README.md 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 e7cd52b5c9da7f0ed264eb0ffa4708a83d16b723 Mon Sep 17 00:00:00 2001 From: nyuki0821 <107778378+nyuki0821@users.noreply.github.com> Date: Sun, 29 Dec 2024 08:44:44 +0900 Subject: [PATCH 14/17] Update README.md on github for conflict2 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c2315b5bf..c01982d86 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -Github上で更新 +Github上で更新 2回目 From 6782470d3e2efb71a98f32f4beae2246fe17daa4 Mon Sep 17 00:00:00 2001 From: nyuki0821 Date: Sun, 29 Dec 2024 08:49:18 +0900 Subject: [PATCH 15/17] 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 c2315b5bf..87c205c6e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -Github上で更新 +conflict-remote上で更新 From 52d5343be910c209e00f01b2cd8efb02186538ec Mon Sep 17 00:00:00 2001 From: nyuki0821 Date: Sun, 29 Dec 2024 08:53:25 +0900 Subject: [PATCH 16/17] update for conflict --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 87c205c6e..849b11151 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -conflict-remote上で更新 +conflict-remote上で更新(コンフリクト発生) From 0add7e23bfdd2ea50454dcfdad58ce465b9d2cc3 Mon Sep 17 00:00:00 2001 From: nyuki0821 Date: Sun, 29 Dec 2024 09:33:19 +0900 Subject: [PATCH 17/17] update readme at my repo --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 849b11151..e62b1a54c 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． -ローカルリポで変更 -conflict-remote上で更新(コンフリクト発生) +自分のリポジトリで更新