From 5896bce2ceec28b395b6ac03e5bf863d338bf2a7 Mon Sep 17 00:00:00 2001 From: makoto-mm1112 Date: Thu, 2 Jan 2025 05:32:00 +0900 Subject: [PATCH 01/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 1895ba0867b4bffe0604530c50368f99d4fe6cdb Mon Sep 17 00:00:00 2001 From: makoto-mm1112 Date: Thu, 2 Jan 2025 05:48:16 +0900 Subject: [PATCH 02/18] 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 29a58d7ca3fd9ed49965cf39d5cec1a2ca890eb6 Mon Sep 17 00:00:00 2001 From: makoto-mm1112 Date: Thu, 2 Jan 2025 05:53:51 +0900 Subject: [PATCH 03/18] namechanged2.txt --- README.md | 1 + namechanged.txt => namechanged2.txt | 0 2 files changed, 1 insertion(+) rename namechanged.txt => namechanged2.txt (100%) diff --git a/README.md b/README.md index 9e7d03700..5b603e514 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,3 @@ # 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 ca462afc0cd48ef899b030c2986fc87af3e5dd14 Mon Sep 17 00:00:00 2001 From: makoto-mm1112 Date: Thu, 2 Jan 2025 06:04:41 +0900 Subject: [PATCH 04/18] 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 ec2a84a3e46ce2bf2ccfa484f8cf67d0079371c4 Mon Sep 17 00:00:00 2001 From: makoto-mm1112 Date: Thu, 2 Jan 2025 06:06:29 +0900 Subject: [PATCH 05/18] 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 f0c85072a9861bf9288d6bea89515ac213013344 Mon Sep 17 00:00:00 2001 From: makoto-mm1112 Date: Thu, 2 Jan 2025 06:10:31 +0900 Subject: [PATCH 06/18] 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 1271b13ab3d1af2c3396fbcfea3b26ad55fd9b25 Mon Sep 17 00:00:00 2001 From: makoto-mm1112 Date: Thu, 2 Jan 2025 06:33:55 +0900 Subject: [PATCH 07/18] add 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 0942e79575e07c627c685145b019821a3ac29c51 Mon Sep 17 00:00:00 2001 From: makoto-mm1112 Date: Thu, 2 Jan 2025 07:18:42 +0900 Subject: [PATCH 08/18] update readme --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5b603e514..578e2e624 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 2dd8f8f7149af4c69fe37ae8df9fe59673b957fa Mon Sep 17 00:00:00 2001 From: makoto-mm1112 Date: Thu, 2 Jan 2025 07:24:04 +0900 Subject: [PATCH 09/18] update readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 578e2e624..0c3597344 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． -リモートリポで変更　 +ローカルリポで変更　 new-featureブランチで変更 \ No newline at end of file From e3278ba699b53051ca44e5d3726bce006de4bded Mon Sep 17 00:00:00 2001 From: makoto-mm1112 Date: Thu, 2 Jan 2025 07:39:55 +0900 Subject: [PATCH 10/18] make new file --- 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 968a55d0e6a195f8494f64f9a49e3bbaf1664c84 Mon Sep 17 00:00:00 2001 From: makoto-mm1112 Date: Thu, 2 Jan 2025 07:57:59 +0900 Subject: [PATCH 11/18] create new file --- newfile.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/newfile.txt b/newfile.txt index 3a63a982e..c5ba79e26 100644 --- a/newfile.txt +++ b/newfile.txt @@ -1 +1,2 @@ -created new file!! \ No newline at end of file +created new file!!! +test \ No newline at end of file From 230111816ccb039a78a039a16ba42b1d561f0b18 Mon Sep 17 00:00:00 2001 From: makoto-mm1112 Date: Thu, 2 Jan 2025 08:18:27 +0900 Subject: [PATCH 12/18] chenged --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 0c3597344..ca0d29dba 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更　 -new-featureブランチで変更 \ No newline at end of file +no-fast-forwardブランチで変更する +再度変更 \ No newline at end of file From 398b6b12d049647b486c244a00715e942a484358 Mon Sep 17 00:00:00 2001 From: makoto-mm1112 Date: Thu, 2 Jan 2025 08:19:49 +0900 Subject: [PATCH 13/18] changed --- newfile.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/newfile.txt b/newfile.txt index c5ba79e26..f6d9159f0 100644 --- a/newfile.txt +++ b/newfile.txt @@ -1,2 +1,3 @@ created new file!!! -test \ No newline at end of file +test +test2 \ No newline at end of file From d6c238315f76aa2bcb571eb90d256eb78d927550 Mon Sep 17 00:00:00 2001 From: makoto-mm1112 Date: Thu, 2 Jan 2025 08:33:11 +0900 Subject: [PATCH 14/18] make conflict --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ca0d29dba..dcd5fdab6 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 82ec98f595dc0475a770ee6583a87086224a049c Mon Sep 17 00:00:00 2001 From: makoto-mm1112 Date: Thu, 2 Jan 2025 08:34:45 +0900 Subject: [PATCH 15/18] resolved conflict --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ca0d29dba..b68d9bf3b 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 819d093f227c1da333914107c4a584054e56e34b Mon Sep 17 00:00:00 2001 From: makoto-mm1112 Date: Thu, 2 Jan 2025 15:09:23 +0900 Subject: [PATCH 16/18] update readme on github --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index dcd5fdab6..36f8da016 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更　 -no-fast-forwardブランチで変更する -conflict変更　コンフリクト発生 \ No newline at end of file +Github上で更新 From 0d536396cb1ceb848a6c23dc645c4876ff9627be Mon Sep 17 00:00:00 2001 From: makoto-mm1112 Date: Thu, 2 Jan 2025 15:21:25 +0900 Subject: [PATCH 17/18] update readme on github conflict --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 36f8da016..01be80248 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更　 -Github上で更新 +Github上で更新2回目 From 21b59f3487351f8a01c4f51809ddd90de636d1bc Mon Sep 17 00:00:00 2001 From: makoto-mm1112 Date: Thu, 2 Jan 2025 15:30:55 +0900 Subject: [PATCH 18/18] Update README.md