From 24b48c6b91f78023dbdf988949a14ef48f5a5fa7 Mon Sep 17 00:00:00 2001 From: Fukuno-ui Date: Fri, 6 Jun 2025 15:42:24 +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..99c7b7d92 --- /dev/null +++ b/newfile.txt @@ -0,0 +1 @@ +newfile作成 \ No newline at end of file From 9e34bc29d2aa1410426ff4a320be5255e13dda11 Mon Sep 17 00:00:00 2001 From: Fukuno-ui Date: Sat, 7 Jun 2025 13:12:48 +0900 Subject: [PATCH 02/16] bhange name --- newfile.txt => nemechanged.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename newfile.txt => nemechanged.txt (100%) diff --git a/newfile.txt b/nemechanged.txt similarity index 100% rename from newfile.txt rename to nemechanged.txt From 07080d5cb99a12e3f1c49f39f3a6d6f2bc25f321 Mon Sep 17 00:00:00 2001 From: Fukuno-ui Date: Sat, 7 Jun 2025 13:24:10 +0900 Subject: [PATCH 03/16] rename and update --- README.md | 1 + nemechanged.txt => namechanged2.txt | 0 2 files changed, 1 insertion(+) rename nemechanged.txt => namechanged2.txt (100%) diff --git a/README.md b/README.md index 9e7d03700..1f941b90f 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． +saranihenkou \ No newline at end of file diff --git a/nemechanged.txt b/namechanged2.txt similarity index 100% rename from nemechanged.txt rename to namechanged2.txt From d7b78d3289c1edda3a35d35a0b95f756c3210c8a Mon Sep 17 00:00:00 2001 From: Fukuno-ui Date: Sat, 7 Jun 2025 13:56:00 +0900 Subject: [PATCH 04/16] 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 e3c4433eb9f44e6f385571021978929d0d14b533 Mon Sep 17 00:00:00 2001 From: Fukuno-ui Date: Sat, 7 Jun 2025 13:58:21 +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 ab5de39d4105d3d7f7ef202fc06d003d48130ea7 Mon Sep 17 00:00:00 2001 From: Fukuno-ui Date: Sat, 7 Jun 2025 14:01:12 +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 eb120b711078b632b086c1bd5fec906fd0613323 Mon Sep 17 00:00:00 2001 From: Fukuno-ui Date: Sat, 7 Jun 2025 16:53:54 +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..542380925 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +outoput.log \ No newline at end of file From d24bc6d7d43b3874a83223524d39662717b651f0 Mon Sep 17 00:00:00 2001 From: Fukuno-ui Date: Sun, 8 Jun 2025 00:36:46 +0900 Subject: [PATCH 08/16] update readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1f941b90f..6fdeeeb5b 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． -saranihenkou \ No newline at end of file +change in new-feature branch \ No newline at end of file From b0282bdfa699260da77c4e2eb468eb733106d148 Mon Sep 17 00:00:00 2001 From: Fukuno-ui Date: Sun, 8 Jun 2025 01:28:34 +0900 Subject: [PATCH 09/16] update readme for automatic merge --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 6fdeeeb5b..eeee7a623 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． -change in new-feature branch \ No newline at end of file +change in new-feature branch +changing in no-fast-forward From 91c34c5b7dba06ec2129b7ad4bb322c89a3fa3f4 Mon Sep 17 00:00:00 2001 From: Fukuno-ui Date: Sun, 8 Jun 2025 01:33:53 +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..96c0fbcb9 --- /dev/null +++ b/newfile.txt @@ -0,0 +1 @@ +created newfile \ No newline at end of file From 86c02da0fdeb3c10f01de329036dd60dc6e62b52 Mon Sep 17 00:00:00 2001 From: Fukuno-ui Date: Sun, 8 Jun 2025 01:48:15 +0900 Subject: [PATCH 11/16] update read me on conflict branch --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index eeee7a623..8e2633e41 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． change in new-feature branch -changing in no-fast-forward +changing in branch of conflict From 156425e0380822157fb4dd6ee2762f1e0dd272f2 Mon Sep 17 00:00:00 2001 From: Fukuno-ui Date: Sun, 8 Jun 2025 01:51:33 +0900 Subject: [PATCH 12/16] update readme on mein for conflict --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index eeee7a623..19514ad35 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． change in new-feature branch -changing in no-fast-forward +changing in main branch to cause conflict From d5a8321faba243142b4dc3305511a912f08dcfdd Mon Sep 17 00:00:00 2001 From: Fukuno-ui Date: Sun, 8 Jun 2025 07:54:07 +0900 Subject: [PATCH 13/16] Update README on Github --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 8e2633e41..e1f41bf49 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． -change in new-feature branch -changing in branch of conflict +github上で更新 From d11ebf565e968157d3ec1da111ebce99c0b102c3 Mon Sep 17 00:00:00 2001 From: Fukuno-ui Date: Sun, 8 Jun 2025 23:23:28 +0900 Subject: [PATCH 14/16] 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 e1f41bf49..76a16e678 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． -github上で更新 +github上で更新2回目 From 7a16dc793f16e28377a7682fd326bde118feb4f8 Mon Sep 17 00:00:00 2001 From: Fukuno-ui Date: Sun, 8 Jun 2025 23:25:34 +0900 Subject: [PATCH 15/16] update readme on conflict-remote --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e1f41bf49..19f1c6c05 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． -github上で更新 +conflict-remote上で更新 From 8496516cd9593cc4f1f8e3cd05b158eb3da22ebf Mon Sep 17 00:00:00 2001 From: Fukuno-ui Date: Fri, 13 Jun 2025 20:45:23 +0900 Subject: [PATCH 16/16] update readme at my repo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 19f1c6c05..41714aff4 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． -conflict-remote上で更新 +自分のリポジトリで更新 \ No newline at end of file