From ad900e86722cdea25fa6c360e2759b6fce77f33e Mon Sep 17 00:00:00 2001 From: kiyose-yu Date: Tue, 13 May 2025 20:03:27 +0900 Subject: [PATCH 01/25] 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..32e8dc6cc --- /dev/null +++ b/newfile.txt @@ -0,0 +1 @@ +newfileの作成データ From 9ee37be04992dd973ddbd16934080c673b474f37 Mon Sep 17 00:00:00 2001 From: kiyose-yu Date: Tue, 13 May 2025 21:30:48 +0900 Subject: [PATCH 02/25] update --- README.md | 1 + newfile.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/README.md b/README.md index 9e7d03700..429bea900 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． +ローカルリポにて変更する。 \ No newline at end of file diff --git a/newfile.txt b/newfile.txt index 32e8dc6cc..9a78b815b 100644 --- a/newfile.txt +++ b/newfile.txt @@ -1 +1,2 @@ newfileの作成データ +再度変更する。 From fac9778750a44af7e5bcd0b4e70dc52be58f41ab Mon Sep 17 00:00:00 2001 From: kiyose-yu Date: Fri, 16 May 2025 13:58:56 +0900 Subject: [PATCH 03/25] test update --- README.md | 3 ++- newfile.txt | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 429bea900..280eb0924 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． -ローカルリポにて変更する。 \ No newline at end of file +Test Test +aaaaaaaa \ No newline at end of file diff --git a/newfile.txt b/newfile.txt index 9a78b815b..c76086dc3 100644 --- a/newfile.txt +++ b/newfile.txt @@ -1,2 +1 @@ -newfileの作成データ -再度変更する。 +newfileの更新データ。 From 678b8ad4bebcf8c4b9d04c1aa9dada95f8e5be54 Mon Sep 17 00:00:00 2001 From: kiyose-yu Date: Sat, 17 May 2025 10:25:38 +0900 Subject: [PATCH 04/25] newfile update --- newfile.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/newfile.txt b/newfile.txt index c76086dc3..37bc03ac9 100644 --- a/newfile.txt +++ b/newfile.txt @@ -1 +1,3 @@ newfileの更新データ。 +newfile 作成 +push リポジトリ \ No newline at end of file From d1004139451c37ee4f0303d8d30c43b21548b755 Mon Sep 17 00:00:00 2001 From: kiyose-yu Date: Sat, 17 May 2025 10:35:45 +0900 Subject: [PATCH 05/25] chaged name --- newfile.txt => namechaged.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename newfile.txt => namechaged.txt (100%) diff --git a/newfile.txt b/namechaged.txt similarity index 100% rename from newfile.txt rename to namechaged.txt From a7a127dd18db8b8087b5afeaa7a79ac2c042a200 Mon Sep 17 00:00:00 2001 From: kiyose-yu Date: Sat, 17 May 2025 11:48:09 +0900 Subject: [PATCH 06/25] chage name again --- README.md | 3 +-- namechaged.txt => namechaged2.txt | 0 2 files changed, 1 insertion(+), 2 deletions(-) rename namechaged.txt => namechaged2.txt (100%) diff --git a/README.md b/README.md index 280eb0924..04e68b2bc 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． -Test Test -aaaaaaaa \ No newline at end of file +git reset HEAD \ No newline at end of file diff --git a/namechaged.txt b/namechaged2.txt similarity index 100% rename from namechaged.txt rename to namechaged2.txt From b1dd3955c6f0aa78d7c59af102a7bb4d60e1d876 Mon Sep 17 00:00:00 2001 From: kiyose-yu Date: Sun, 18 May 2025 18:04:31 +0900 Subject: [PATCH 07/25] make newfile --- 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 eadd912bf42b5f51083d275f6958d8c11a9f477f Mon Sep 17 00:00:00 2001 From: kiyose-yu Date: Sun, 18 May 2025 18:05:45 +0900 Subject: [PATCH 08/25] 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 df07d3aa668a0be2cecb3ae1431104e2e64f44ec Mon Sep 17 00:00:00 2001 From: kiyose-yu Date: Sun, 18 May 2025 18:07:28 +0900 Subject: [PATCH 09/25] newfile --- 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 8d7a2e7f1291cf6d962f127a0496abb1f170ce8a Mon Sep 17 00:00:00 2001 From: kiyose-yu Date: Sun, 18 May 2025 18:58:58 +0900 Subject: [PATCH 10/25] add gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..d6d5c4a00 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +#.gitignoreはgitの管理対象外を指定するファイル。 +output.log From f35ae200de74cbf34acf4b7045490049430049c4 Mon Sep 17 00:00:00 2001 From: kiyose-yu Date: Sun, 18 May 2025 19:23:22 +0900 Subject: [PATCH 11/25] modified file --- README.md | 3 +-- namechaged2.txt | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 04e68b2bc..99ae64374 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,2 @@ # git-practice -このリポジトリはGit動画講座用です． -git reset HEAD \ No newline at end of file +このリポジトリはGit動画講座用です． \ No newline at end of file diff --git a/namechaged2.txt b/namechaged2.txt index 37bc03ac9..af6dc42f3 100644 --- a/namechaged2.txt +++ b/namechaged2.txt @@ -1,3 +1 @@ -newfileの更新データ。 -newfile 作成 -push リポジトリ \ No newline at end of file +newfile.txt作成 \ No newline at end of file From ec77005cf0207a36c4a5639aa998a431f932f020 Mon Sep 17 00:00:00 2001 From: kiyose-yu Date: Fri, 23 May 2025 19:47:31 +0900 Subject: [PATCH 12/25] update README --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 99ae64374..652961452 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,3 @@ # git-practice -このリポジトリはGit動画講座用です． \ No newline at end of file +このリポジトリはGit動画講座用です． +new-feature branchで変更 \ No newline at end of file From 085ffeec6bd9105eb0ddaf4af307fe2535ae90b6 Mon Sep 17 00:00:00 2001 From: kiyose-yu Date: Fri, 23 May 2025 20:08:40 +0900 Subject: [PATCH 13/25] update automatic merge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 652961452..868d81f41 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． -new-feature branchで変更 \ No newline at end of file +no-fast-forward branchで変更 \ No newline at end of file From 71db7b955abcfe9034bf85c0874bf7a9637c47cf Mon Sep 17 00:00:00 2001 From: kiyose-yu Date: Fri, 23 May 2025 20:12:25 +0900 Subject: [PATCH 14/25] create 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..969323ef6 --- /dev/null +++ b/newfile.txt @@ -0,0 +1 @@ +main branchで新規作成。 \ No newline at end of file From e17a699192a26c365d5c884816dfbc3b5092a96f Mon Sep 17 00:00:00 2001 From: kiyose-yu Date: Sat, 24 May 2025 20:46:45 +0900 Subject: [PATCH 15/25] up README --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 652961452..69bce7070 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． -new-feature branchで変更 \ No newline at end of file +new-feature branchで変更 +#practice of git merge \ No newline at end of file From c63e05d024a847be197b3a29ecee64daf3fa672c Mon Sep 17 00:00:00 2001 From: kiyose-yu Date: Tue, 27 May 2025 18:57:29 +0900 Subject: [PATCH 16/25] update README --- README.md | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index ab3431e74..1053fedc0 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． -<<<<<<< HEAD -new-feature branchで変更 -#practice of git merge -======= -no-fast-forward branchで変更 ->>>>>>> no-fast-forward + +new-feature branchで追加。 From 3adba7b5c5d9c7cfdad6d3e84bf08277eecc3310 Mon Sep 17 00:00:00 2001 From: kiyose-yu Date: Tue, 27 May 2025 19:14:36 +0900 Subject: [PATCH 17/25] update readme for automatic merge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1053fedc0..3361cf968 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． -new-feature branchで追加。 +no-fast-forward branchで変更。 \ No newline at end of file From 350d17576105c87596db14db1a433f09e5be2f89 Mon Sep 17 00:00:00 2001 From: kiyose-yu Date: Tue, 27 May 2025 19:18:20 +0900 Subject: [PATCH 18/25] create new2file --- new2file.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 new2file.txt diff --git a/new2file.txt b/new2file.txt new file mode 100644 index 000000000..ad966edb7 --- /dev/null +++ b/new2file.txt @@ -0,0 +1 @@ +created new2file \ No newline at end of file From 649467491ee032770a48d1c22003400f379d7b82 Mon Sep 17 00:00:00 2001 From: kiyose-yu Date: Tue, 27 May 2025 19:33:22 +0900 Subject: [PATCH 19/25] update readme on conflict branch --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3361cf968..bd616c7eb 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． - -no-fast-forward branchで変更。 \ No newline at end of file +ローカルリポで変更 +conflict branchで変更。（コンフリクト発生） \ No newline at end of file From e5e7f5804bc124a70406124b4cc06ba27e0beefb Mon Sep 17 00:00:00 2001 From: kiyose-yu Date: Tue, 27 May 2025 19:35:44 +0900 Subject: [PATCH 20/25] 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 3361cf968..9693a4385 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． -no-fast-forward branchで変更。 \ No newline at end of file +main branchで変更。（コンフリクト発生） \ No newline at end of file From 0af3420a3fa0a592b03e1a15882b74fd4095f16a Mon Sep 17 00:00:00 2001 From: Kiyose <105598506+kiyose-yu@users.noreply.github.com> Date: Thu, 29 May 2025 19:21:03 +0900 Subject: [PATCH 21/25] Update README.md on github --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bd616c7eb..d5b6dcb7a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -conflict branchで変更。（コンフリクト発生） \ No newline at end of file +github上で更新。 From 6c343648b4dd54ff7311cc5754105678482761f4 Mon Sep 17 00:00:00 2001 From: Kiyose <105598506+kiyose-yu@users.noreply.github.com> Date: Thu, 29 May 2025 19:36:56 +0900 Subject: [PATCH 22/25] Update README.md for conflict --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index d5b6dcb7a..25668d611 100644 --- a/README.md +++ b/README.md @@ -2,3 +2,4 @@ このリポジトリはGit動画講座用です． ローカルリポで変更 github上で更新。 +コンフリクト編集 From d8c9b265126f0b0285b1d1364dda37c09a57ccc7 Mon Sep 17 00:00:00 2001 From: kiyose-yu Date: Thu, 29 May 2025 19:38:36 +0900 Subject: [PATCH 23/25] update README at Conflict-remote --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d5b6dcb7a..3e9565d83 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -github上で更新。 +Conflict-Remote上で更新。（コンフリクト発生） \ No newline at end of file From 387c61c7edaf850d76920288d8f04e1b8dc05e0d Mon Sep 17 00:00:00 2001 From: Kiyose <105598506+kiyose-yu@users.noreply.github.com> Date: Thu, 29 May 2025 19:58:01 +0900 Subject: [PATCH 24/25] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 25668d611..3a13c5952 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -github上で更新。 -コンフリクト編集 +Github上で更新 +コンフリクト From b0e39b3b9b991ef8470241d5568e3da553ef600c Mon Sep 17 00:00:00 2001 From: kiyose-yu Date: Fri, 30 May 2025 12:46:32 +0900 Subject: [PATCH 25/25] update readme --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 1fbdcf7b0..41714aff4 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． -ローカルリポで変更 -Conflict-Remote上で更新。（コンフリクト発生） +自分のリポジトリで更新 \ No newline at end of file