From f5b6b714fa59678aa0e3d29fdc817a43d2623655 Mon Sep 17 00:00:00 2001 From: ComradeAlex97 Date: Sun, 30 Oct 2022 14:05:49 +0200 Subject: [PATCH 1/4] first commit --- GitPractice/src/Main.java | 6 ++++++ GitPractice/src/ex.html | 3 +++ 2 files changed, 9 insertions(+) create mode 100644 GitPractice/src/Main.java create mode 100644 GitPractice/src/ex.html diff --git a/GitPractice/src/Main.java b/GitPractice/src/Main.java new file mode 100644 index 00000000..ed88a4f3 --- /dev/null +++ b/GitPractice/src/Main.java @@ -0,0 +1,6 @@ +public class Main { + public static void main(String[] args) { + System.out.println("Hello world!"); + } + +} \ No newline at end of file diff --git a/GitPractice/src/ex.html b/GitPractice/src/ex.html new file mode 100644 index 00000000..2dd7ab64 --- /dev/null +++ b/GitPractice/src/ex.html @@ -0,0 +1,3 @@ + + + \ No newline at end of file From 6edfd3f3f8e51fc20dd318f6d0d14df334db1125 Mon Sep 17 00:00:00 2001 From: ComradeAlex97 Date: Sun, 30 Oct 2022 14:14:48 +0200 Subject: [PATCH 2/4] updated main with fix code --- GitPractice/src/Main.java | 1 + 1 file changed, 1 insertion(+) diff --git a/GitPractice/src/Main.java b/GitPractice/src/Main.java index ed88a4f3..377efcb1 100644 --- a/GitPractice/src/Main.java +++ b/GitPractice/src/Main.java @@ -1,6 +1,7 @@ public class Main { public static void main(String[] args) { System.out.println("Hello world!"); + System.out.println("I have fixed the issue"); } } \ No newline at end of file From 7fbf7d6dd2fbda9d55a5d6f87193fde99298e165 Mon Sep 17 00:00:00 2001 From: ComradeAlex97 Date: Sun, 30 Oct 2022 14:19:53 +0200 Subject: [PATCH 3/4] updated ex1 --- GitPractice/src/Main.java | 1 + 1 file changed, 1 insertion(+) diff --git a/GitPractice/src/Main.java b/GitPractice/src/Main.java index 377efcb1..3c40ccf7 100644 --- a/GitPractice/src/Main.java +++ b/GitPractice/src/Main.java @@ -2,6 +2,7 @@ public class Main { public static void main(String[] args) { System.out.println("Hello world!"); System.out.println("I have fixed the issue"); + System.out.println("Changed file"); } } \ No newline at end of file From e2cf4ea9820ba31a020331c68aaac3864fa0689c Mon Sep 17 00:00:00 2001 From: ComradeAlex97 Date: Sun, 30 Oct 2022 14:20:39 +0200 Subject: [PATCH 4/4] updated master --- GitPractice/src/Main.java | 1 + 1 file changed, 1 insertion(+) diff --git a/GitPractice/src/Main.java b/GitPractice/src/Main.java index 377efcb1..ca15d456 100644 --- a/GitPractice/src/Main.java +++ b/GitPractice/src/Main.java @@ -2,6 +2,7 @@ public class Main { public static void main(String[] args) { System.out.println("Hello world!"); System.out.println("I have fixed the issue"); + System.out.println("Updated master"); } } \ No newline at end of file