From a04ec62c349b646fae32b8c2385f5dbd2480a9ab Mon Sep 17 00:00:00 2001 From: Maruyama49107 Date: Wed, 18 Jun 2025 11:35:01 +0900 Subject: [PATCH 01/15] 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..c49bccf6e --- /dev/null +++ b/newfile.txt @@ -0,0 +1 @@ +make new file \ No newline at end of file From 7e3f73d942d51edb440b4d6acda36c60c7f7d253 Mon Sep 17 00:00:00 2001 From: Maruyama49107 Date: Wed, 18 Jun 2025 11:57:58 +0900 Subject: [PATCH 02/15] changedname.txt --- 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 da22b0faff553c0c02318d68ec0d8f903314810c Mon Sep 17 00:00:00 2001 From: Maruyama49107 Date: Wed, 18 Jun 2025 12:04:12 +0900 Subject: [PATCH 03/15] change name again --- 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..e4288c116 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． +change ripo \ 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 49e3db183234a97998936bae4c60e0931389bb7f Mon Sep 17 00:00:00 2001 From: Maruyama49107 Date: Wed, 18 Jun 2025 13:17:50 +0900 Subject: [PATCH 04/15] 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 8e3af96b65157c183789a56c2c57b0646a6a64ef Mon Sep 17 00:00:00 2001 From: Maruyama49107 Date: Wed, 18 Jun 2025 13:19:28 +0900 Subject: [PATCH 05/15] 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 119c724ee2fcd7b5ec18f34cd82d6e10640fced0 Mon Sep 17 00:00:00 2001 From: Maruyama49107 Date: Wed, 18 Jun 2025 13:21:49 +0900 Subject: [PATCH 06/15] new file --- foo.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 foo.txt diff --git a/foo.txt b/foo.txt new file mode 100644 index 000000000..e69de29bb From 98d1c195a69852853b9918bf209623149edd2882 Mon Sep 17 00:00:00 2001 From: Maruyama49107 Date: Thu, 19 Jun 2025 14:46:31 +0900 Subject: [PATCH 07/15] update readme.md --- .gitignore | 1 + README.md | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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 diff --git a/README.md b/README.md index e4288c116..b667deda3 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # git-practice -このリポジトリはGit動画講座用です． +I made a new-feature branch change ripo \ No newline at end of file From 458c72ff649ec32034e2f96a4e7cc5adba1e03fb Mon Sep 17 00:00:00 2001 From: Maruyama49107 Date: Thu, 19 Jun 2025 15:00:04 +0900 Subject: [PATCH 08/15] uodate readme for automatic merge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b667deda3..a20395024 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # git-practice -I made a new-feature branch +I made a no-fast-forward branch change ripo \ No newline at end of file From 994abff65a6985e3599155aec611fc9212e88c80 Mon Sep 17 00:00:00 2001 From: Maruyama49107 Date: Thu, 19 Jun 2025 15:04:12 +0900 Subject: [PATCH 09/15] 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 ff34dc27fcd5af18cd4322164fadc027e18bac65 Mon Sep 17 00:00:00 2001 From: Maruyama49107 Date: Thu, 19 Jun 2025 15:20:04 +0900 Subject: [PATCH 10/15] update readme for conflict --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a20395024..b06361c1b 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # git-practice -I made a no-fast-forward branch +I made a conflict branch change ripo \ No newline at end of file From 9a874f8544910b8fc6a6fcf08fc6c6815fb786ec Mon Sep 17 00:00:00 2001 From: Maruyama49107 Date: Thu, 19 Jun 2025 15:23:12 +0900 Subject: [PATCH 11/15] 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 a20395024..1e8550617 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # git-practice -I made a no-fast-forward branch +I made a branch in main branch change ripo \ No newline at end of file From d03874e1d748d026f696c55142a718ee6ed4e406 Mon Sep 17 00:00:00 2001 From: Maruyama49107 Date: Fri, 20 Jun 2025 09:09:38 +0900 Subject: [PATCH 12/15] Update on github --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index b06361c1b..8a6838422 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ # git-practice I made a conflict branch -change ripo \ No newline at end of file +change ripo + +update on Github From 5da93eefb00a8630dc02925d21948d3a0af8b951 Mon Sep 17 00:00:00 2001 From: Maruyama49107 Date: Fri, 20 Jun 2025 09:21:12 +0900 Subject: [PATCH 13/15] Update on github for 2nd time --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 8a6838422..592e74e9a 100644 --- a/README.md +++ b/README.md @@ -3,3 +3,4 @@ I made a conflict branch change ripo update on Github +for the second time From 3450a735c4ab6cdf51d1e5b27f3cb9ac7934649e Mon Sep 17 00:00:00 2001 From: Maruyama49107 Date: Fri, 20 Jun 2025 09:24:00 +0900 Subject: [PATCH 14/15] update readme on conflict-remote --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8a6838422..4bc968bc0 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,4 @@ I made a conflict branch change ripo -update on Github +update on conflict-remote From 0f4ad7c4a4894c13549a919f36aae4eac38efadc Mon Sep 17 00:00:00 2001 From: Maruyama49107 Date: Fri, 20 Jun 2025 09:48:19 +0900 Subject: [PATCH 15/15] update readme at my repo --- README.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/README.md b/README.md index b63c843ff..557226d77 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,2 @@ # git-practice -I made a conflict branch -change ripo -update on conflict-remote - +I uppdate on my repo \ No newline at end of file