From ae029a3f6e7cba1b13dfb5a72d27756100df9cc3 Mon Sep 17 00:00:00 2001 From: cascade226 Date: Wed, 25 Sep 2024 22:16:32 +0900 Subject: [PATCH 01/14] 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..1271944b7 --- /dev/null +++ b/newfile.txt @@ -0,0 +1 @@ +new file \ No newline at end of file From a5cf056141b9ce20c1b495bf0e868ced2331597f Mon Sep 17 00:00:00 2001 From: cascade226 Date: Wed, 25 Sep 2024 23:01:41 +0900 Subject: [PATCH 02/14] changed 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 a372251bf66e27192b568b80244fcd31406948c9 Mon Sep 17 00:00:00 2001 From: cascade226 Date: Wed, 25 Sep 2024 23:14:31 +0900 Subject: [PATCH 03/14] 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..08f3a52c0 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 963afe45c0b3b127bd68cbd1e4a46356b7ea396e Mon Sep 17 00:00:00 2001 From: cascade226 Date: Sat, 28 Sep 2024 18:26:01 +0900 Subject: [PATCH 04/14] update readme --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 08f3a52c0..ffeaa759e 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 201b6f82b196899643febe2367742b4433866507 Mon Sep 17 00:00:00 2001 From: cascade226 Date: Sat, 28 Sep 2024 18:29:06 +0900 Subject: [PATCH 05/14] update readme one more --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index ffeaa759e..9546d0ff8 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． 追加 -new-feature用に追加 \ No newline at end of file From 2c5711fa3848ad80baabc66c74350d1b20ac026d Mon Sep 17 00:00:00 2001 From: cascade226 Date: Sat, 28 Sep 2024 21:23:40 +0900 Subject: [PATCH 06/14] update readme for automatic merge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9546d0ff8..ef7fa6d89 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． -追加 +no-fast-forwardで変更 \ No newline at end of file From 661b62ecf5822c71b513edae8cebbdb609567d51 Mon Sep 17 00:00:00 2001 From: cascade226 Date: Sat, 28 Sep 2024 21:27:53 +0900 Subject: [PATCH 07/14] 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..1271944b7 --- /dev/null +++ b/newfile.txt @@ -0,0 +1 @@ +new file \ No newline at end of file From 7ccf7bf049a9a22d46f7f631a13d3a01e4ab3048 Mon Sep 17 00:00:00 2001 From: cascade226 Date: Sat, 28 Sep 2024 22:10:21 +0900 Subject: [PATCH 08/14] update readme on coflict branch for conflict --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ef7fa6d89..6ce2a1adb 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． -no-fast-forwardで変更 \ No newline at end of file +conflictで変更 \ No newline at end of file From b4ad2564e60a50dec580225e2f7718bebcc98f51 Mon Sep 17 00:00:00 2001 From: cascade226 Date: Sat, 28 Sep 2024 22:11:41 +0900 Subject: [PATCH 09/14] 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 ef7fa6d89..080a1d498 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． -no-fast-forwardで変更 \ No newline at end of file +mainで変更 \ No newline at end of file From 9c2c79b66ceb594acec5531320ce4c6dd31d9c4d Mon Sep 17 00:00:00 2001 From: cascade226 Date: Sat, 28 Sep 2024 23:21:34 +0900 Subject: [PATCH 10/14] Update readme on github --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 6ce2a1adb..1c319fcc9 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． -conflictで変更 \ No newline at end of file +conflictで変更 +Github上で更新 From 81b852d5343425219e328833549acbf1e89e927e Mon Sep 17 00:00:00 2001 From: cascade226 Date: Sun, 29 Sep 2024 00:10:17 +0900 Subject: [PATCH 11/14] Update readme on github one more --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1c319fcc9..429ebf155 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． conflictで変更 -Github上で更新 +Github上で更新した From e989c5e40354f9734584eda235af88ce664af233 Mon Sep 17 00:00:00 2001 From: cascade226 Date: Sun, 29 Sep 2024 00:25:16 +0900 Subject: [PATCH 12/14] 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 429ebf155..d62ef629e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． conflictで変更 -Github上で更新した +Github上で更新したよ From 0073eb8f4bfbc264401e7fe3fdd60fad0986ac67 Mon Sep 17 00:00:00 2001 From: cascade226 Date: Sun, 29 Sep 2024 00:30:40 +0900 Subject: [PATCH 13/14] 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 429ebf155..347a7bbc2 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． conflictで変更 -Github上で更新した +Github上で更新してない From 8a7c7716669f47781ed119355214b664c55ed756 Mon Sep 17 00:00:00 2001 From: cascade226 Date: Sun, 29 Sep 2024 17:32:04 +0900 Subject: [PATCH 14/14] update readme at myrepo --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 347a7bbc2..e62b1a54c 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． -conflictで変更 -Github上で更新してない +自分のリポジトリで更新