From 6e984e48d22bfe4d23f02b4789e1261df0cecb35 Mon Sep 17 00:00:00 2001 From: wnso <109727039+wnso-kim@users.noreply.github.com> Date: Fri, 1 Mar 2024 20:23:32 +0900 Subject: [PATCH 1/5] Delete pr_test.md --- pr_test.md | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 pr_test.md diff --git a/pr_test.md b/pr_test.md deleted file mode 100644 index 80cdd82..0000000 --- a/pr_test.md +++ /dev/null @@ -1,6 +0,0 @@ -1. 커밋 -2. push -3. pr -4. 커밋 - -위 과정을 했을 때, 4번의 커밋이 3번 커밋과 합쳐지는지 테스트 From b1eab3398c5d58f02e99d66dc58f62ac362f3859 Mon Sep 17 00:00:00 2001 From: wnso <109727039+wnso-kim@users.noreply.github.com> Date: Fri, 1 Mar 2024 20:23:42 +0900 Subject: [PATCH 2/5] Delete pr_test2.md --- pr_test2.md | 1 - 1 file changed, 1 deletion(-) delete mode 100644 pr_test2.md diff --git a/pr_test2.md b/pr_test2.md deleted file mode 100644 index ef916c8..0000000 --- a/pr_test2.md +++ /dev/null @@ -1 +0,0 @@ -커밋을 pr 했을 때, pr이 닫히지 않은 경우 커밋을 계속 하면 어떻게 될까? From 02d3cb633872204838951b988c85a8f18a734a6c Mon Sep 17 00:00:00 2001 From: wnso <109727039+wnso-kim@users.noreply.github.com> Date: Fri, 1 Mar 2024 20:24:21 +0900 Subject: [PATCH 3/5] =?UTF-8?q?Feat=20>=20PR=EC=9D=84=20=EC=9C=84=ED=95=9C?= =?UTF-8?q?=20=EC=BB=A4=EB=B0=8B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PR_Test.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 PR_Test.md diff --git a/PR_Test.md b/PR_Test.md new file mode 100644 index 0000000..6dcf44f --- /dev/null +++ b/PR_Test.md @@ -0,0 +1,4 @@ +1. 파일을 커밋합니다. +2. pr을 합니다. +3. pr이 merge되기 전, 커밋을 합니다. +4. 새로운 pr을 생성할 수 있는지 확인합니다. From 17d2f26d077721217dd4145a311f4e2fb7920b2c Mon Sep 17 00:00:00 2001 From: wnso <109727039+wnso-kim@users.noreply.github.com> Date: Fri, 1 Mar 2024 20:26:03 +0900 Subject: [PATCH 4/5] =?UTF-8?q?Feat=20>=20PR=EC=9D=B4=ED=9B=84=20=EB=B3=91?= =?UTF-8?q?=ED=95=A9=EB=90=98=EA=B8=B0=20=EC=A0=84=20=EC=BB=A4=EB=B0=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PR_Test2.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 PR_Test2.md diff --git a/PR_Test2.md b/PR_Test2.md new file mode 100644 index 0000000..6dcf44f --- /dev/null +++ b/PR_Test2.md @@ -0,0 +1,4 @@ +1. 파일을 커밋합니다. +2. pr을 합니다. +3. pr이 merge되기 전, 커밋을 합니다. +4. 새로운 pr을 생성할 수 있는지 확인합니다. From d006c67fb0fda4f738a888598b1cd343a3c0215d Mon Sep 17 00:00:00 2001 From: wnso <109727039+wnso-kim@users.noreply.github.com> Date: Tue, 19 Mar 2024 10:48:01 +0900 Subject: [PATCH 5/5] Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 4a8cadf..c983503 100644 --- a/README.md +++ b/README.md @@ -3,3 +3,6 @@ ## 테스트[1] 특정 파일로 브랜치 생성하기 ## 테스트[2] PR 머지를 위해 최소 1명의 review가 필요하도록 설정 + + +## git branch 전략