From d68cf3bb50045301fe6d46a3446816f2b13178f7 Mon Sep 17 00:00:00 2001 From: ujiken512 Date: Sun, 15 Feb 2026 20:15:54 +0900 Subject: [PATCH 01/26] 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 a85f8e4db8aa286ac3b9b16bc63e2b867479d08c Mon Sep 17 00:00:00 2001 From: ujiken512 Date: Sun, 15 Feb 2026 20:37:00 +0900 Subject: [PATCH 02/26] 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 10808d7ce4dec90edef0115c38d0183291cf72a2 Mon Sep 17 00:00:00 2001 From: ujiken512 Date: Sun, 15 Feb 2026 20:41:04 +0900 Subject: [PATCH 03/26] 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..623acaed0 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． +ローカルリポで変更 diff --git a/namechanged.txt b/namechanged2.txt similarity index 100% rename from namechanged.txt rename to namechanged2.txt From 3817f14605c52e3a719f257e0cd050cb0088b53f Mon Sep 17 00:00:00 2001 From: ujiken512 Date: Sun, 15 Feb 2026 20:50:57 +0900 Subject: [PATCH 04/26] 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 6d4605081193d3d5b0d462495c913909ccdf9103 Mon Sep 17 00:00:00 2001 From: ujiken512 Date: Sun, 15 Feb 2026 20:52:24 +0900 Subject: [PATCH 05/26] 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 b7971efbae4f2b8006bce1db7fce4e923ee96e67 Mon Sep 17 00:00:00 2001 From: ujiken512 Date: Sun, 15 Feb 2026 20:53:47 +0900 Subject: [PATCH 06/26] 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 cd2c54d1c90b42c3ac0b80e45cd3be371c7c09fd Mon Sep 17 00:00:00 2001 From: ujiken512 Date: Sun, 15 Feb 2026 21:12:01 +0900 Subject: [PATCH 07/26] 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..f0de82f57 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +output.log \ No newline at end of file From bfbb8505cf4532faafcbde4077832547ef6c952c Mon Sep 17 00:00:00 2001 From: ujiken512 Date: Mon, 16 Feb 2026 09:14:50 +0900 Subject: [PATCH 08/26] update readme --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 623acaed0..a42f3b914 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． -ローカルリポで変更 +ローカルリポで変更 +new-featureブランチで変更 \ No newline at end of file From 6d54d1b223c8f98cef5c9e38769e1b779233de09 Mon Sep 17 00:00:00 2001 From: ujiken512 Date: Mon, 16 Feb 2026 09:32:29 +0900 Subject: [PATCH 09/26] update readme for automatic merge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a42f3b914..4fe6ad164 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -new-featureブランチで変更 \ No newline at end of file +no-fast-forwardブランチで変更 \ No newline at end of file From 044491fc4a1ee60b3dbc4559e93609d886bb3bd3 Mon Sep 17 00:00:00 2001 From: ujiken512 Date: Mon, 16 Feb 2026 09:36:18 +0900 Subject: [PATCH 10/26] 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 7ba2bf0fe5f1ccf32496bdd86838d870dd797375 Mon Sep 17 00:00:00 2001 From: ujiken512 Date: Mon, 16 Feb 2026 11:01:56 +0900 Subject: [PATCH 11/26] update readme on conflict branch for conflict --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4fe6ad164..383aea761 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -no-fast-forwardブランチで変更 \ No newline at end of file +conflictブランチで変更(コンフリクト発生) From d2e4a4672d6941004b7aeb93c6b14c15fc90e5b7 Mon Sep 17 00:00:00 2001 From: ujiken512 Date: Mon, 16 Feb 2026 11:04:56 +0900 Subject: [PATCH 12/26] 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 4fe6ad164..bc314b287 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -no-fast-forwardブランチで変更 \ No newline at end of file +mainブランチで変更（コンフリクト発生） \ No newline at end of file From 69eb4c33c2c864b7e48e7574a6d963aef4bfc54a Mon Sep 17 00:00:00 2001 From: ujiken512 <127214371+ujiken512@users.noreply.github.com> Date: Mon, 16 Feb 2026 11:30:26 +0900 Subject: [PATCH 13/26] Update README to reflect changes on GitHub update readme on GitHub --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 383aea761..7f0efae4c 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -conflictブランチで変更(コンフリクト発生) +GitHub上で更新 From a2abd3687f6bdde1935d0782cff0decfd20fec53 Mon Sep 17 00:00:00 2001 From: ujiken512 <127214371+ujiken512@users.noreply.github.com> Date: Mon, 16 Feb 2026 11:50:43 +0900 Subject: [PATCH 14/26] 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 7f0efae4c..589e87c66 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -GitHub上で更新 +GitHub上で更新2回目 From cbb0d4115b0b081ca907e3fb0e746825f45a0aed Mon Sep 17 00:00:00 2001 From: ujiken512 Date: Mon, 16 Feb 2026 11:53:52 +0900 Subject: [PATCH 15/26] 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 7f0efae4c..d4909946e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -GitHub上で更新 +conflict-remote上で更新(コンフリクト発生) From 62522c3a93eda18a7451ffefbe12a1240073102f Mon Sep 17 00:00:00 2001 From: ujiken512 Date: Mon, 16 Feb 2026 16:16:43 +0900 Subject: [PATCH 16/26] make anotherfile on main --- another_file.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 another_file.txt diff --git a/another_file.txt b/another_file.txt new file mode 100644 index 000000000..54285cc6c --- /dev/null +++ b/another_file.txt @@ -0,0 +1 @@ +新しいファイルをmainで作成 \ No newline at end of file From 4f6ffc5c2c9d2a923706c2c373eff15e3576e17a Mon Sep 17 00:00:00 2001 From: ujiken512 Date: Mon, 16 Feb 2026 16:12:11 +0900 Subject: [PATCH 17/26] update readme on rebase-practice --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d4909946e..c343b81ac 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -conflict-remote上で更新(コンフリクト発生) +rebase-practiceブランチで更新(rebase用) From 0a0fb272048d4accd9c1e9cd97381b19700048a0 Mon Sep 17 00:00:00 2001 From: ujiken512 Date: Mon, 16 Feb 2026 16:36:26 +0900 Subject: [PATCH 18/26] 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 c343b81ac..46e74aa27 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -rebase-practiceブランチで更新(rebase用) +mainブランチで更新(rebase コンフリクト用) From 1e659c4e25beaaf77aa51269ee252954cb313af7 Mon Sep 17 00:00:00 2001 From: ujiken512 Date: Mon, 16 Feb 2026 16:34:08 +0900 Subject: [PATCH 19/26] update readme on rebase-practice for conflict --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 46e74aa27..1ff747032 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． ローカルリポで変更 -mainブランチで更新(rebase コンフリクト用) +rebase-practiceブランチで更新(rebase コンフリクト用) From 0f8e1b2ddc6e9ffa46cd6f64c9d72834d0a871e4 Mon Sep 17 00:00:00 2001 From: ujiken512 <127214371+ujiken512@users.noreply.github.com> Date: Mon, 16 Feb 2026 17:15:25 +0900 Subject: [PATCH 20/26] Add note for rebase pull usage --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 1ff747032..324628318 100644 --- a/README.md +++ b/README.md @@ -2,3 +2,4 @@ このリポジトリはGit動画講座用です． ローカルリポで変更 rebase-practiceブランチで更新(rebase コンフリクト用) +rebase pull用 From c8d0b68fd723f88381af945b51736b21c2b17eb7 Mon Sep 17 00:00:00 2001 From: ujiken512 Date: Mon, 16 Feb 2026 17:13:33 +0900 Subject: [PATCH 21/26] update anotherfile --- another_file.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/another_file.txt b/another_file.txt index 54285cc6c..1d68e3398 100644 --- a/another_file.txt +++ b/another_file.txt @@ -1 +1,2 @@ -新しいファイルをmainで作成 \ No newline at end of file +新しいファイルをmainで作成 +pull時のrebase用コミット \ No newline at end of file From 92dc147766c014e9f948c4348848ebdee1f1b5c2 Mon Sep 17 00:00:00 2001 From: ujiken512 Date: Mon, 16 Feb 2026 17:32:02 +0900 Subject: [PATCH 22/26] make new urgentfile --- urgent_file.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 urgent_file.txt diff --git a/urgent_file.txt b/urgent_file.txt new file mode 100644 index 000000000..4d10f55ff --- /dev/null +++ b/urgent_file.txt @@ -0,0 +1 @@ +緊急の作業 \ No newline at end of file From f92c0b3f188016067c66e00b10a0b478d5100d12 Mon Sep 17 00:00:00 2001 From: ujiken512 Date: Mon, 16 Feb 2026 17:42:06 +0900 Subject: [PATCH 23/26] fix conflict --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 324628318..ca356ebc7 100644 --- a/README.md +++ b/README.md @@ -3,3 +3,4 @@ ローカルリポで変更 rebase-practiceブランチで更新(rebase コンフリクト用) rebase pull用 +stash練習 \ No newline at end of file From 00ec3cfddc570d681e72e327261df9f9dae6b988 Mon Sep 17 00:00:00 2001 From: ujiken512 Date: Mon, 16 Feb 2026 17:58:18 +0900 Subject: [PATCH 24/26] update gitignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index f0de82f57..12e80045f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -output.log \ No newline at end of file +output.log +ignore_file.txt \ No newline at end of file From 2e69b603e0d60fd300e915274a1f36387d0f4ddd Mon Sep 17 00:00:00 2001 From: ujiken512 Date: Mon, 16 Feb 2026 18:05:54 +0900 Subject: [PATCH 25/26] clean up --- README.md | 2 +- untrack.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 untrack.txt diff --git a/README.md b/README.md index ca356ebc7..b63561a75 100644 --- a/README.md +++ b/README.md @@ -3,4 +3,4 @@ ローカルリポで変更 rebase-practiceブランチで更新(rebase コンフリクト用) rebase pull用 -stash練習 \ No newline at end of file +stash練習(トラック済) \ No newline at end of file diff --git a/untrack.txt b/untrack.txt new file mode 100644 index 000000000..9d2103e10 --- /dev/null +++ b/untrack.txt @@ -0,0 +1 @@ +git stashでstashされません \ No newline at end of file From 823a522b4400b58b9e321c289a6cd7638be0f858 Mon Sep 17 00:00:00 2001 From: ujiken512 Date: Sat, 21 Feb 2026 11:51:08 +0900 Subject: [PATCH 26/26] update readme for v1.1 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b63561a75..826734b94 100644 --- a/README.md +++ b/README.md @@ -3,4 +3,4 @@ ローカルリポで変更 rebase-practiceブランチで更新(rebase コンフリクト用) rebase pull用 -stash練習(トラック済) \ No newline at end of file +stash練習(2nd変更) \ No newline at end of file