From 5cd1d247137b4fbdcfa1df2fd1bc8d2a99cfe29a Mon Sep 17 00:00:00 2001 From: Kyumin Date: Fri, 3 Feb 2023 13:11:34 +0900 Subject: [PATCH 1/5] add my text --- upDown.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upDown.java b/upDown.java index 6252f9d..c2a95d6 100644 --- a/upDown.java +++ b/upDown.java @@ -1,4 +1,4 @@ -// 소스 코드 수정 중 +// 소스 코드 수정 완료 package game; From eb8fee79d20a8ff408172dc6f224a19434226a7a Mon Sep 17 00:00:00 2001 From: Kyumin Date: Fri, 3 Feb 2023 13:49:16 +0900 Subject: [PATCH 2/5] First commit --- HelloJAVA/.classpath | 10 ++++++++++ HelloJAVA/.gitignore | 1 + HelloJAVA/.project | 17 +++++++++++++++++ .../.settings/org.eclipse.core.resources.prefs | 2 ++ HelloJAVA/.settings/org.eclipse.jdt.core.prefs | 14 ++++++++++++++ HelloJAVA/src/test.java | 8 ++++++++ 6 files changed, 52 insertions(+) create mode 100644 HelloJAVA/.classpath create mode 100644 HelloJAVA/.gitignore create mode 100644 HelloJAVA/.project create mode 100644 HelloJAVA/.settings/org.eclipse.core.resources.prefs create mode 100644 HelloJAVA/.settings/org.eclipse.jdt.core.prefs create mode 100644 HelloJAVA/src/test.java diff --git a/HelloJAVA/.classpath b/HelloJAVA/.classpath new file mode 100644 index 0000000..d54800d --- /dev/null +++ b/HelloJAVA/.classpath @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/HelloJAVA/.gitignore b/HelloJAVA/.gitignore new file mode 100644 index 0000000..ae3c172 --- /dev/null +++ b/HelloJAVA/.gitignore @@ -0,0 +1 @@ +/bin/ diff --git a/HelloJAVA/.project b/HelloJAVA/.project new file mode 100644 index 0000000..a714969 --- /dev/null +++ b/HelloJAVA/.project @@ -0,0 +1,17 @@ + + + HelloJAVA + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + + diff --git a/HelloJAVA/.settings/org.eclipse.core.resources.prefs b/HelloJAVA/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/HelloJAVA/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/HelloJAVA/.settings/org.eclipse.jdt.core.prefs b/HelloJAVA/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..f2525a8 --- /dev/null +++ b/HelloJAVA/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,14 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/HelloJAVA/src/test.java b/HelloJAVA/src/test.java new file mode 100644 index 0000000..8771745 --- /dev/null +++ b/HelloJAVA/src/test.java @@ -0,0 +1,8 @@ + +public class test { + + public test() { + // git 테스트 중 + } + +} From 7626c9886c02d28e9774c5d009446962d69c06f7 Mon Sep 17 00:00:00 2001 From: Kyumin Shim <124243365+KYUMAENG@users.noreply.github.com> Date: Fri, 3 Feb 2023 14:10:33 +0900 Subject: [PATCH 3/5] Create test. java --- HelloJAVA/test. java | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 HelloJAVA/test. java diff --git a/HelloJAVA/test. java b/HelloJAVA/test. java new file mode 100644 index 0000000..2943468 --- /dev/null +++ b/HelloJAVA/test. java @@ -0,0 +1,2 @@ +// 원격 저장소에서 pull 하기 +// 새 파일 생성 From adf3fb142747cb4a395e4d552f18b948bb2fb564 Mon Sep 17 00:00:00 2001 From: Kyumin Date: Fri, 3 Feb 2023 14:25:06 +0900 Subject: [PATCH 4/5] Secon commit --- HelloJAVA/test. java | 2 -- HelloJAVA/test2. java | 7 +++++++ 2 files changed, 7 insertions(+), 2 deletions(-) delete mode 100644 HelloJAVA/test. java create mode 100644 HelloJAVA/test2. java diff --git a/HelloJAVA/test. java b/HelloJAVA/test. java deleted file mode 100644 index 2943468..0000000 --- a/HelloJAVA/test. java +++ /dev/null @@ -1,2 +0,0 @@ -// 원격 저장소에서 pull 하기 -// 새 파일 생성 diff --git a/HelloJAVA/test2. java b/HelloJAVA/test2. java new file mode 100644 index 0000000..571cf81 --- /dev/null +++ b/HelloJAVA/test2. java @@ -0,0 +1,7 @@ +// 원격 저장소에서 pull 하기 +// 새 파일 생성 + +// 1.코드 수정 -> 스테이징 -> 커밋 -> 푸시 -> +// 깃허브 사이트에서 푸시 확인 +// 2. 깃허브 사이트 -> 코드 수정, 커밋 -> 로컬 이클립스에서 pull + From 33c23fcdf3aeb96a9960cc52d583efdbf8c2c7ee Mon Sep 17 00:00:00 2001 From: Kyumin Shim <124243365+KYUMAENG@users.noreply.github.com> Date: Fri, 3 Feb 2023 14:27:05 +0900 Subject: [PATCH 5/5] Update test2. java --- HelloJAVA/test2. java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/HelloJAVA/test2. java b/HelloJAVA/test2. java index 571cf81..9aece56 100644 --- a/HelloJAVA/test2. java +++ b/HelloJAVA/test2. java @@ -5,3 +5,7 @@ // 깃허브 사이트에서 푸시 확인 // 2. 깃허브 사이트 -> 코드 수정, 커밋 -> 로컬 이클립스에서 pull + +// 3번째 수정 +// 깃허브에서 수정하기 +// 이클립스에서 pull