From 53b742e93adabfb0d064d887fc8ed83e8f61b11a Mon Sep 17 00:00:00 2001 From: oyaniwakani Date: Sun, 18 May 2025 18:32:33 +0900 Subject: [PATCH 01/22] add files --- .gitignore | 1 + index.html | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100644 .gitignore create mode 100644 index.html diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..9aa6a64e3 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +output.log diff --git a/index.html b/index.html new file mode 100644 index 000000000..ed8329d95 --- /dev/null +++ b/index.html @@ -0,0 +1,9 @@ + + + + + +

Hello World

+ + + From 84da30fc4c566d4a030eeb5c2c16f8bc990fe879 Mon Sep 17 00:00:00 2001 From: oyaniwakani Date: Sun, 18 May 2025 18:34:50 +0900 Subject: [PATCH 02/22] mod index.html --- index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/index.html b/index.html index ed8329d95..ac32dfb73 100644 --- a/index.html +++ b/index.html @@ -1,9 +1,9 @@ - + - + hello world -

Hello World

+

hello world

From b84b7c9837ae58bba4d0cc8036e8f369a365e3a2 Mon Sep 17 00:00:00 2001 From: oyaniwakani Date: Mon, 19 May 2025 00:48:28 +0900 Subject: [PATCH 03/22] mod readme --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 9e7d03700..9cedad042 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． +new-featureブランチで編集を実施。 From 0edbf73d0e3d0cfdef05b98a1fb331abd73945df Mon Sep 17 00:00:00 2001 From: oyaniwakani Date: Tue, 20 May 2025 00:06:59 +0900 Subject: [PATCH 04/22] update readme for automatic merge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 9cedad042..9fe79ed1e 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． new-featureブランチで編集を実施。 +no-fast-forwardで編集を実施。 From 5d53797766ef01d62c9d591ed9d623404e5dd8e6 Mon Sep 17 00:00:00 2001 From: oyaniwakani Date: Tue, 20 May 2025 00:12:10 +0900 Subject: [PATCH 05/22] make new file for automatic merge --- newfile.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 newfile.txt diff --git a/newfile.txt b/newfile.txt new file mode 100644 index 000000000..e69de29bb From b673c83f017daab4f58ff7c125e028baa3e40e63 Mon Sep 17 00:00:00 2001 From: oyaniwakani Date: Sat, 24 May 2025 17:10:56 +0900 Subject: [PATCH 06/22] update readme for conflict --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9fe79ed1e..73bbb0cd1 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． new-featureブランチで編集を実施。 -no-fast-forwardで編集を実施。 +conflictブランチで編集を実施。(コンフリクトの発生) From a6c58a6ec573c23ab9fe1b3639ac5dbd70408646 Mon Sep 17 00:00:00 2001 From: oyaniwakani Date: Sat, 24 May 2025 17:17:02 +0900 Subject: [PATCH 07/22] 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 9fe79ed1e..4bdb84311 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． new-featureブランチで編集を実施。 -no-fast-forwardで編集を実施。 +mainブランチで編集を実施(コンフリクトの発生)。 From 58c2e2e2207e91da409ccbfeee1fb32621b6eeac Mon Sep 17 00:00:00 2001 From: oyaniwakani <57857716+oyaniwakani@users.noreply.github.com> Date: Sat, 24 May 2025 18:54:49 +0900 Subject: [PATCH 08/22] Update README.md on github --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 73bbb0cd1..e2a1224f5 100644 --- a/README.md +++ b/README.md @@ -2,3 +2,4 @@ このリポジトリはGit動画講座用です． new-featureブランチで編集を実施。 conflictブランチで編集を実施。(コンフリクトの発生) +github上で更新 From f1d790299ae2e12e2f9ed71d951e649ed336511a Mon Sep 17 00:00:00 2001 From: oyaniwakani Date: Sat, 24 May 2025 19:54:36 +0900 Subject: [PATCH 09/22] 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 e2a1224f5..9ec2ed309 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,4 @@ このリポジトリはGit動画講座用です． new-featureブランチで編集を実施。 conflictブランチで編集を実施。(コンフリクトの発生) -github上で更新 +conflict-remote上で更新(conflictの発生) From b3b195c567827c5dcbb11a8c9c0ac51a8d9f38ce Mon Sep 17 00:00:00 2001 From: oyaniwakani <57857716+oyaniwakani@users.noreply.github.com> Date: Sat, 24 May 2025 19:58:01 +0900 Subject: [PATCH 10/22] Update README.md on github for conflict --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e2a1224f5..17011120f 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,4 @@ このリポジトリはGit動画講座用です． new-featureブランチで編集を実施。 conflictブランチで編集を実施。(コンフリクトの発生) -github上で更新 +github上で更新(コンフリクトの発生) From 12f7eb06edf83b1bfe13685bba5bec3ea120b7c8 Mon Sep 17 00:00:00 2001 From: oyaniwakani Date: Wed, 28 May 2025 00:05:36 +0900 Subject: [PATCH 11/22] update readme at my repo --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 9ec2ed309..93a1fcc4b 100644 --- a/README.md +++ b/README.md @@ -3,3 +3,4 @@ new-featureブランチで編集を実施。 conflictブランチで編集を実施。(コンフリクトの発生) conflict-remote上で更新(conflictの発生) +自分のリポジトリで更新 From e5c911198287cfdb4df7e80680312f2c1f5f9b3c Mon Sep 17 00:00:00 2001 From: oyaniwakani Date: Sun, 1 Jun 2025 00:07:27 +0900 Subject: [PATCH 12/22] create new file --- anotherfile.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 anotherfile.txt diff --git a/anotherfile.txt b/anotherfile.txt new file mode 100644 index 000000000..44ca2bae2 --- /dev/null +++ b/anotherfile.txt @@ -0,0 +1 @@ +create new file on xx branch. From b5893cc323f63c19f5af78d73bf9ab173784661f Mon Sep 17 00:00:00 2001 From: oyaniwakani Date: Sun, 1 Jun 2025 00:02:09 +0900 Subject: [PATCH 13/22] update readme on rebase-practice --- README.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/README.md b/README.md index 93a1fcc4b..fb543dc25 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． -new-featureブランチで編集を実施。 -conflictブランチで編集を実施。(コンフリクトの発生) -conflict-remote上で更新(conflictの発生) -自分のリポジトリで更新 +rebase-branchで編集 From 381f78b44b317e5c4645b9a0acb9f199f5be491b Mon Sep 17 00:00:00 2001 From: oyaniwakani Date: Sun, 1 Jun 2025 12:14:17 +0900 Subject: [PATCH 14/22] update readme on main --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fb543dc25..29bf45afd 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． -rebase-branchで編集 +mainで編集(conflict) From a5bff0dbddfdc7013649fdd7e2b092b2ef494bf3 Mon Sep 17 00:00:00 2001 From: oyaniwakani Date: Sun, 1 Jun 2025 12:08:58 +0900 Subject: [PATCH 15/22] update readme on rebase-practice --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 29bf45afd..72d6fb5be 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # git-practice このリポジトリはGit動画講座用です． -mainで編集(conflict) +rebase-branchで編集(conflict 発生) From 813df3f3fc91aff1ceb323f39c8ef6fe4877549c Mon Sep 17 00:00:00 2001 From: oyaniwakani <57857716+oyaniwakani@users.noreply.github.com> Date: Sun, 1 Jun 2025 12:55:54 +0900 Subject: [PATCH 16/22] Update README.md for pull --rebase --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 72d6fb5be..f167301ab 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． rebase-branchで編集(conflict 発生) +pull --rebase用で編集 From 52cf83f1a195b9af5b96ccf6a3ed5c88c528b7a3 Mon Sep 17 00:00:00 2001 From: oyaniwakani Date: Sun, 1 Jun 2025 12:52:52 +0900 Subject: [PATCH 17/22] update anotherfile --- anotherfile.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/anotherfile.txt b/anotherfile.txt index 44ca2bae2..9b66c3fa7 100644 --- a/anotherfile.txt +++ b/anotherfile.txt @@ -1 +1,2 @@ create new file on xx branch. +pull時のrebase用 From a0d527c7a3a190558aded80e044155f04b239579 Mon Sep 17 00:00:00 2001 From: oyaniwakani Date: Sun, 1 Jun 2025 16:41:17 +0900 Subject: [PATCH 18/22] create urgent work file. --- 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..b13606c3f --- /dev/null +++ b/urgent_file.txt @@ -0,0 +1 @@ +urgent work!! From 4ed29cf30f9fb81b7371794ce4b857209595ff00 Mon Sep 17 00:00:00 2001 From: oyaniwakani Date: Tue, 3 Jun 2025 20:21:33 +0900 Subject: [PATCH 19/22] fix conflict --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f167301ab..b181aa560 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． rebase-branchで編集(conflict 発生) -pull --rebase用で編集 +stash practice From 5ff6fdcb222d4d0f00c1f9277326e50cbd88b9d0 Mon Sep 17 00:00:00 2001 From: oyaniwakani Date: Sat, 7 Jun 2025 15:11:07 +0900 Subject: [PATCH 20/22] update .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 9aa6a64e3..b055d80ab 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ output.log +ignore_file.txt From 3082be542d68ec01bd7319734e007c201e0471ef Mon Sep 17 00:00:00 2001 From: oyaniwakani Date: Sat, 7 Jun 2025 16:07:05 +0900 Subject: [PATCH 21/22] 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 b181aa560..73ffafd9e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． rebase-branchで編集(conflict 発生) -stash practice +stash practice(track確認) diff --git a/untrack.txt b/untrack.txt new file mode 100644 index 000000000..831773312 --- /dev/null +++ b/untrack.txt @@ -0,0 +1 @@ +untrack確認→stashでstashされない From 1ef82920bf888fb4443962b0672522173c676072 Mon Sep 17 00:00:00 2001 From: oyaniwakani Date: Sun, 15 Jun 2025 13:46:31 +0900 Subject: [PATCH 22/22] update readme for v1.1 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 73ffafd9e..9304b9dcd 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # git-practice このリポジトリはGit動画講座用です． rebase-branchで編集(conflict 発生) -stash practice(track確認) +stash practice(2nd stash)