From 80618c102abcb5f4bbd2e2e78e6cab9ab5d32ce2 Mon Sep 17 00:00:00 2001 From: jeet041 Date: Tue, 22 Apr 2025 13:30:00 +0530 Subject: [PATCH 01/39] Update test_conflict.java Signed-off-by: jeet041 --- .../org/springframework/samples/petclinic/test_conflict.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/springframework/samples/petclinic/test_conflict.java b/src/main/java/org/springframework/samples/petclinic/test_conflict.java index 02da51bfb..dd97fd5d7 100644 --- a/src/main/java/org/springframework/samples/petclinic/test_conflict.java +++ b/src/main/java/org/springframework/samples/petclinic/test_conflict.java @@ -5,6 +5,7 @@ public class HelloWorld { public static void helloWorld() { System.out.println("Hello, World!"); - System.out.println("Hello, World! from main"); + System.out.println("Hello, World! from dev"); + System.out.println("Hello, World! from dev"); } } From 70d8403f2a839deedeb3aa0c1195b68c142de9cb Mon Sep 17 00:00:00 2001 From: Jitendra-Mahor_brillio Date: Tue, 22 Apr 2025 15:17:14 +0530 Subject: [PATCH 02/39] =?UTF-8?q?=F0=9F=A4=96=20Auto-resolved=20merge=20co?= =?UTF-8?q?nflicts=20with=20Claude=20AI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../samples/petclinic/test_conflict.java | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/springframework/samples/petclinic/test_conflict.java b/src/main/java/org/springframework/samples/petclinic/test_conflict.java index dd97fd5d7..7f19d7419 100644 --- a/src/main/java/org/springframework/samples/petclinic/test_conflict.java +++ b/src/main/java/org/springframework/samples/petclinic/test_conflict.java @@ -1,11 +1,4 @@ -public class HelloWorld { - public static void main(String[] args) { - helloWorld(); - } - - public static void helloWorld() { - System.out.println("Hello, World!"); - System.out.println("Hello, World! from dev"); - System.out.println("Hello, World! from dev"); - } -} +{ +"code": "public class HelloWorld {\n public static void main(String[] args) {\n helloWorld();\n }\n\n public static void helloWorld() {\n System.out.println(\"Hello, World!\");\n System.out.println(\"Hello, World! from dev\");\n System.out.println(\"Hello, World! from main\");\n }\n}", +"confidence Score": 85 +} \ No newline at end of file From 8863c61fe258ad4dcfd66f8f36764ce5aaaac3ec Mon Sep 17 00:00:00 2001 From: jeet041 Date: Tue, 22 Apr 2025 15:19:20 +0530 Subject: [PATCH 03/39] Update test_conflict.java Signed-off-by: jeet041 --- .../samples/petclinic/test_conflict.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/springframework/samples/petclinic/test_conflict.java b/src/main/java/org/springframework/samples/petclinic/test_conflict.java index 7f19d7419..dd97fd5d7 100644 --- a/src/main/java/org/springframework/samples/petclinic/test_conflict.java +++ b/src/main/java/org/springframework/samples/petclinic/test_conflict.java @@ -1,4 +1,11 @@ -{ -"code": "public class HelloWorld {\n public static void main(String[] args) {\n helloWorld();\n }\n\n public static void helloWorld() {\n System.out.println(\"Hello, World!\");\n System.out.println(\"Hello, World! from dev\");\n System.out.println(\"Hello, World! from main\");\n }\n}", -"confidence Score": 85 -} \ No newline at end of file +public class HelloWorld { + public static void main(String[] args) { + helloWorld(); + } + + public static void helloWorld() { + System.out.println("Hello, World!"); + System.out.println("Hello, World! from dev"); + System.out.println("Hello, World! from dev"); + } +} From a5d677ad49fa21605fce3c0a919c3d5a02285561 Mon Sep 17 00:00:00 2001 From: Jitendra-Mahor_brillio Date: Tue, 22 Apr 2025 15:20:50 +0530 Subject: [PATCH 04/39] =?UTF-8?q?=F0=9F=A4=96=20Auto-resolved=20merge=20co?= =?UTF-8?q?nflicts=20with=20Claude=20AI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springframework/samples/petclinic/test_conflict.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/springframework/samples/petclinic/test_conflict.java b/src/main/java/org/springframework/samples/petclinic/test_conflict.java index dd97fd5d7..cb4eeefe4 100644 --- a/src/main/java/org/springframework/samples/petclinic/test_conflict.java +++ b/src/main/java/org/springframework/samples/petclinic/test_conflict.java @@ -5,7 +5,7 @@ public class HelloWorld { public static void helloWorld() { System.out.println("Hello, World!"); - System.out.println("Hello, World! from dev"); - System.out.println("Hello, World! from dev"); + System.out.println("Hello, World! from dev"); + System.out.println("Hello, World! from main"); } -} +} \ No newline at end of file From c8953daddf2941255032887e8183274c2a094398 Mon Sep 17 00:00:00 2001 From: jeet041 Date: Tue, 22 Apr 2025 16:10:12 +0530 Subject: [PATCH 05/39] Update test_conflict.java Signed-off-by: jeet041 --- .../springframework/samples/petclinic/test_conflict.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/springframework/samples/petclinic/test_conflict.java b/src/main/java/org/springframework/samples/petclinic/test_conflict.java index cb4eeefe4..c46a17ad3 100644 --- a/src/main/java/org/springframework/samples/petclinic/test_conflict.java +++ b/src/main/java/org/springframework/samples/petclinic/test_conflict.java @@ -4,8 +4,6 @@ public class HelloWorld { } public static void helloWorld() { - System.out.println("Hello, World!"); - System.out.println("Hello, World! from dev"); - System.out.println("Hello, World! from main"); + System.out.println("Hello"); } -} \ No newline at end of file +} From e91dadeb2fcd317feeed6f8cbf35458ea3bd9d74 Mon Sep 17 00:00:00 2001 From: Jitendra-Mahor_brillio Date: Tue, 22 Apr 2025 16:40:19 +0530 Subject: [PATCH 06/39] =?UTF-8?q?=F0=9F=A4=96=20Auto-resolved=20merge=20co?= =?UTF-8?q?nflicts=20with=20Claude=20AI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/springframework/samples/petclinic/test_conflict.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/springframework/samples/petclinic/test_conflict.java b/src/main/java/org/springframework/samples/petclinic/test_conflict.java index c46a17ad3..7bd8192d4 100644 --- a/src/main/java/org/springframework/samples/petclinic/test_conflict.java +++ b/src/main/java/org/springframework/samples/petclinic/test_conflict.java @@ -4,6 +4,6 @@ public class HelloWorld { } public static void helloWorld() { - System.out.println("Hello"); + System.out.println("Hello, World!"); } -} +} \ No newline at end of file From 2b70de3ff22fc4284826adcbab7aaa806afcac01 Mon Sep 17 00:00:00 2001 From: jeet041 Date: Tue, 22 Apr 2025 16:42:41 +0530 Subject: [PATCH 07/39] Update test_conflict.java Signed-off-by: jeet041 --- .../org/springframework/samples/petclinic/test_conflict.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/springframework/samples/petclinic/test_conflict.java b/src/main/java/org/springframework/samples/petclinic/test_conflict.java index 7bd8192d4..bd9c8c9d3 100644 --- a/src/main/java/org/springframework/samples/petclinic/test_conflict.java +++ b/src/main/java/org/springframework/samples/petclinic/test_conflict.java @@ -4,6 +4,6 @@ public class HelloWorld { } public static void helloWorld() { - System.out.println("Hello, World!"); + System.out.println("Hello, World! dev"); } -} \ No newline at end of file +} From 31eb3ad691d2160f264645dc169583d8a85d36a1 Mon Sep 17 00:00:00 2001 From: Jitendra-Mahor_brillio Date: Tue, 22 Apr 2025 16:43:19 +0530 Subject: [PATCH 08/39] =?UTF-8?q?=F0=9F=A4=96=20Auto-resolved=20merge=20co?= =?UTF-8?q?nflicts=20with=20Claude=20AI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/springframework/samples/petclinic/test_conflict.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/springframework/samples/petclinic/test_conflict.java b/src/main/java/org/springframework/samples/petclinic/test_conflict.java index bd9c8c9d3..7bd8192d4 100644 --- a/src/main/java/org/springframework/samples/petclinic/test_conflict.java +++ b/src/main/java/org/springframework/samples/petclinic/test_conflict.java @@ -4,6 +4,6 @@ public class HelloWorld { } public static void helloWorld() { - System.out.println("Hello, World! dev"); + System.out.println("Hello, World!"); } -} +} \ No newline at end of file From 1aed130c70d3580782665e3db07e7d670076f97f Mon Sep 17 00:00:00 2001 From: Jitendra-Mahor_brillio Date: Tue, 22 Apr 2025 16:46:47 +0530 Subject: [PATCH 09/39] =?UTF-8?q?=F0=9F=A4=96=20Auto-resolved=20merge=20co?= =?UTF-8?q?nflicts=20with=20Claude=20AI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/springframework/samples/petclinic/test_conflict.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/springframework/samples/petclinic/test_conflict.java b/src/main/java/org/springframework/samples/petclinic/test_conflict.java index 7bd8192d4..e34e3bbdd 100644 --- a/src/main/java/org/springframework/samples/petclinic/test_conflict.java +++ b/src/main/java/org/springframework/samples/petclinic/test_conflict.java @@ -4,6 +4,6 @@ public class HelloWorld { } public static void helloWorld() { - System.out.println("Hello, World!"); + System.out.println("Hello, World! main"); } } \ No newline at end of file From 1af0a66d161c8e392a41dfaae6fe823d59e1439f Mon Sep 17 00:00:00 2001 From: jeet041 Date: Tue, 22 Apr 2025 17:12:21 +0530 Subject: [PATCH 10/39] Update test_conflict.java Signed-off-by: jeet041 --- .../org/springframework/samples/petclinic/test_conflict.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/springframework/samples/petclinic/test_conflict.java b/src/main/java/org/springframework/samples/petclinic/test_conflict.java index e34e3bbdd..bd9c8c9d3 100644 --- a/src/main/java/org/springframework/samples/petclinic/test_conflict.java +++ b/src/main/java/org/springframework/samples/petclinic/test_conflict.java @@ -4,6 +4,6 @@ public class HelloWorld { } public static void helloWorld() { - System.out.println("Hello, World! main"); + System.out.println("Hello, World! dev"); } -} \ No newline at end of file +} From 15206e0efe24d950dcbe9fa7a1b12e74cc74029a Mon Sep 17 00:00:00 2001 From: Jitendra-Mahor_brillio Date: Tue, 22 Apr 2025 17:13:38 +0530 Subject: [PATCH 11/39] =?UTF-8?q?=F0=9F=A4=96=20Auto-resolved=20merge=20co?= =?UTF-8?q?nflicts=20with=20Claude=20AI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/springframework/samples/petclinic/test_conflict.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/springframework/samples/petclinic/test_conflict.java b/src/main/java/org/springframework/samples/petclinic/test_conflict.java index bd9c8c9d3..7bd8192d4 100644 --- a/src/main/java/org/springframework/samples/petclinic/test_conflict.java +++ b/src/main/java/org/springframework/samples/petclinic/test_conflict.java @@ -4,6 +4,6 @@ public class HelloWorld { } public static void helloWorld() { - System.out.println("Hello, World! dev"); + System.out.println("Hello, World!"); } -} +} \ No newline at end of file From 99df760eacf5bfca1518ff45446a609a7cb2e9c3 Mon Sep 17 00:00:00 2001 From: jeet041 Date: Tue, 22 Apr 2025 17:19:48 +0530 Subject: [PATCH 12/39] Update test_conflict.java Signed-off-by: jeet041 --- .../org/springframework/samples/petclinic/test_conflict.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/springframework/samples/petclinic/test_conflict.java b/src/main/java/org/springframework/samples/petclinic/test_conflict.java index 7bd8192d4..514646af9 100644 --- a/src/main/java/org/springframework/samples/petclinic/test_conflict.java +++ b/src/main/java/org/springframework/samples/petclinic/test_conflict.java @@ -5,5 +5,8 @@ public class HelloWorld { public static void helloWorld() { System.out.println("Hello, World!"); + System.out.println("Hello, World! dev.."); + System.out.println("Hello, World! dev...."); + System.out.println("Hello, World!dev ...."); } -} \ No newline at end of file +} From dae1070aba23b00baac5c4cd38a64fa625538618 Mon Sep 17 00:00:00 2001 From: Jitendra-Mahor_brillio Date: Tue, 22 Apr 2025 17:22:45 +0530 Subject: [PATCH 13/39] =?UTF-8?q?=F0=9F=A4=96=20Auto-resolved=20merge=20co?= =?UTF-8?q?nflicts=20with=20Claude=20AI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springframework/samples/petclinic/test_conflict.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/springframework/samples/petclinic/test_conflict.java b/src/main/java/org/springframework/samples/petclinic/test_conflict.java index 514646af9..78d408120 100644 --- a/src/main/java/org/springframework/samples/petclinic/test_conflict.java +++ b/src/main/java/org/springframework/samples/petclinic/test_conflict.java @@ -5,8 +5,8 @@ public class HelloWorld { public static void helloWorld() { System.out.println("Hello, World!"); - System.out.println("Hello, World! dev.."); - System.out.println("Hello, World! dev...."); - System.out.println("Hello, World!dev ...."); + System.out.println("Hello, World! main"); + System.out.println("Hello, World! main....."); + System.out.println("Hello, World! main......."); } -} +} \ No newline at end of file From c269c3fedad08cb4837faa80a5cebfc8221acfac Mon Sep 17 00:00:00 2001 From: Jitendra-Mahor_brillio Date: Tue, 22 Apr 2025 17:24:39 +0530 Subject: [PATCH 14/39] =?UTF-8?q?=F0=9F=A4=96=20Auto-resolved=20merge=20co?= =?UTF-8?q?nflicts=20with=20Claude=20AI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From 6ebd2f687faf99e0fcb04087aab7ef903ff4e19b Mon Sep 17 00:00:00 2001 From: Jitendra-Mahor_brillio Date: Tue, 22 Apr 2025 17:26:03 +0530 Subject: [PATCH 15/39] =?UTF-8?q?=F0=9F=A4=96=20Auto-resolved=20merge=20co?= =?UTF-8?q?nflicts=20with=20Claude=20AI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From dfa8d3c86be031532947e21e3c4c6d589259deb9 Mon Sep 17 00:00:00 2001 From: Jitendra-Mahor_brillio Date: Tue, 22 Apr 2025 17:27:42 +0530 Subject: [PATCH 16/39] =?UTF-8?q?=F0=9F=A4=96=20Auto-resolved=20merge=20co?= =?UTF-8?q?nflicts=20with=20Claude=20AI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From e450d67c9d79b48cd9534447f9a8635f3cc3ca39 Mon Sep 17 00:00:00 2001 From: Jitendra-Mahor_brillio Date: Tue, 22 Apr 2025 17:30:19 +0530 Subject: [PATCH 17/39] =?UTF-8?q?=F0=9F=A4=96=20Auto-resolved=20merge=20co?= =?UTF-8?q?nflicts=20with=20Claude=20AI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From ccd89e09549b44f9da6cf65fa9a1f5d9afe69d55 Mon Sep 17 00:00:00 2001 From: jeet041 Date: Tue, 22 Apr 2025 17:35:16 +0530 Subject: [PATCH 18/39] Update test_conflict.java Signed-off-by: jeet041 --- .../springframework/samples/petclinic/test_conflict.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/main/java/org/springframework/samples/petclinic/test_conflict.java b/src/main/java/org/springframework/samples/petclinic/test_conflict.java index 1435c7dca..5b27dfbd7 100644 --- a/src/main/java/org/springframework/samples/petclinic/test_conflict.java +++ b/src/main/java/org/springframework/samples/petclinic/test_conflict.java @@ -5,9 +5,5 @@ public class HelloWorld { public static void helloWorld() { System.out.println("Hello, World!"); - - System.out.println("Hello, World! main"); - System.out.println("Hello, World! main....."); - System.out.println("Hello, World! main......."); } -} \ No newline at end of file +} From 03bcf69bece4866abbe1d30224a7660989f22892 Mon Sep 17 00:00:00 2001 From: Jitendra-Mahor_brillio Date: Tue, 22 Apr 2025 17:36:01 +0530 Subject: [PATCH 19/39] =?UTF-8?q?=F0=9F=A4=96=20Auto-resolved=20merge=20co?= =?UTF-8?q?nflicts=20with=20Claude=20AI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/springframework/samples/petclinic/test_conflict.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/springframework/samples/petclinic/test_conflict.java b/src/main/java/org/springframework/samples/petclinic/test_conflict.java index 5b27dfbd7..bf6064ed0 100644 --- a/src/main/java/org/springframework/samples/petclinic/test_conflict.java +++ b/src/main/java/org/springframework/samples/petclinic/test_conflict.java @@ -5,5 +5,6 @@ public class HelloWorld { public static void helloWorld() { System.out.println("Hello, World!"); + System.out.println("Hello, World! main"); } -} +} \ No newline at end of file From 4cf2872be67c12415af99bd47a9375e12c92c2c9 Mon Sep 17 00:00:00 2001 From: Jitendra-Mahor_brillio Date: Tue, 22 Apr 2025 17:37:19 +0530 Subject: [PATCH 20/39] =?UTF-8?q?=F0=9F=A4=96=20Auto-resolved=20merge=20co?= =?UTF-8?q?nflicts=20with=20Claude=20AI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From 899707ab9451f22bd79fda1816862d4adbb06a8c Mon Sep 17 00:00:00 2001 From: Jitendra-Mahor_brillio Date: Tue, 22 Apr 2025 17:39:24 +0530 Subject: [PATCH 21/39] =?UTF-8?q?=F0=9F=A4=96=20Auto-resolved=20merge=20co?= =?UTF-8?q?nflicts=20with=20Claude=20AI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From 266765cc4539c6ca771ba975e5b9f797b1c87375 Mon Sep 17 00:00:00 2001 From: Jitendra-Mahor_brillio Date: Tue, 22 Apr 2025 17:41:58 +0530 Subject: [PATCH 22/39] =?UTF-8?q?=F0=9F=A4=96=20Auto-resolved=20merge=20co?= =?UTF-8?q?nflicts=20with=20Claude=20AI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From 6fd91c27ca7701694867a1ccbaf93a22ec2c87e5 Mon Sep 17 00:00:00 2001 From: Jitendra-Mahor_brillio Date: Tue, 22 Apr 2025 17:46:35 +0530 Subject: [PATCH 23/39] =?UTF-8?q?=F0=9F=A4=96=20Auto-resolved=20merge=20co?= =?UTF-8?q?nflicts=20with=20Claude=20AI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From 9260c299fe09b1b02d2e490a1f4a7ea2773220cd Mon Sep 17 00:00:00 2001 From: jeet041 Date: Tue, 22 Apr 2025 20:18:29 +0530 Subject: [PATCH 24/39] Update test_conflict.java Signed-off-by: jeet041 --- .../springframework/samples/petclinic/test_conflict.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/springframework/samples/petclinic/test_conflict.java b/src/main/java/org/springframework/samples/petclinic/test_conflict.java index 0bd24b8fd..bd9c8c9d3 100644 --- a/src/main/java/org/springframework/samples/petclinic/test_conflict.java +++ b/src/main/java/org/springframework/samples/petclinic/test_conflict.java @@ -4,8 +4,6 @@ public class HelloWorld { } public static void helloWorld() { - System.out.println("Hello, World!"); - System.out.println("Hello, World! main"); - + System.out.println("Hello, World! dev"); } -} \ No newline at end of file +} From a848644aa36aace1a1f24981802b1bb810034879 Mon Sep 17 00:00:00 2001 From: AI Resolver Date: Tue, 22 Apr 2025 20:53:16 +0530 Subject: [PATCH 25/39] =?UTF-8?q?=F0=9F=A4=96=20Auto-resolved=20merge=20co?= =?UTF-8?q?nflicts=20with=20Claude=20AI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/springframework/samples/petclinic/test_conflict.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/springframework/samples/petclinic/test_conflict.java b/src/main/java/org/springframework/samples/petclinic/test_conflict.java index bd9c8c9d3..e34e3bbdd 100644 --- a/src/main/java/org/springframework/samples/petclinic/test_conflict.java +++ b/src/main/java/org/springframework/samples/petclinic/test_conflict.java @@ -4,6 +4,6 @@ public class HelloWorld { } public static void helloWorld() { - System.out.println("Hello, World! dev"); + System.out.println("Hello, World! main"); } -} +} \ No newline at end of file From 782b4733328cfdcb1aac5e89c779c21021572a4e Mon Sep 17 00:00:00 2001 From: AI Resolver Date: Wed, 23 Apr 2025 10:26:12 +0530 Subject: [PATCH 26/39] =?UTF-8?q?=F0=9F=A4=96=20Auto-resolved=20merge=20co?= =?UTF-8?q?nflicts=20with=20Claude=20AI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/springframework/samples/petclinic/test_conflict.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/springframework/samples/petclinic/test_conflict.java b/src/main/java/org/springframework/samples/petclinic/test_conflict.java index e34e3bbdd..6f853bb6e 100644 --- a/src/main/java/org/springframework/samples/petclinic/test_conflict.java +++ b/src/main/java/org/springframework/samples/petclinic/test_conflict.java @@ -6,4 +6,6 @@ public class HelloWorld { public static void helloWorld() { System.out.println("Hello, World! main"); } -} \ No newline at end of file +} + +// Confidence Score: 100% \ No newline at end of file From 33835fe8f7db59ddb0dc4e4ea18fdb5cbf9c557e Mon Sep 17 00:00:00 2001 From: AI Resolver Date: Wed, 23 Apr 2025 10:28:41 +0530 Subject: [PATCH 27/39] =?UTF-8?q?=F0=9F=A4=96=20Auto-resolved=20merge=20co?= =?UTF-8?q?nflicts=20with=20Claude=20AI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From 28a1973b5fc84fee1e5bcd587d48c2bd1ed1c30f Mon Sep 17 00:00:00 2001 From: AI Resolver Date: Wed, 23 Apr 2025 10:51:26 +0530 Subject: [PATCH 28/39] =?UTF-8?q?=F0=9F=A4=96=20Auto-resolved=20merge=20co?= =?UTF-8?q?nflicts=20with=20Claude=20AI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/springframework/samples/petclinic/test_conflict.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/org/springframework/samples/petclinic/test_conflict.java b/src/main/java/org/springframework/samples/petclinic/test_conflict.java index 6f853bb6e..e34e3bbdd 100644 --- a/src/main/java/org/springframework/samples/petclinic/test_conflict.java +++ b/src/main/java/org/springframework/samples/petclinic/test_conflict.java @@ -6,6 +6,4 @@ public class HelloWorld { public static void helloWorld() { System.out.println("Hello, World! main"); } -} - -// Confidence Score: 100% \ No newline at end of file +} \ No newline at end of file From a22253921a1b9d3b59316d983e5c714b7f73f040 Mon Sep 17 00:00:00 2001 From: jeet041 Date: Wed, 23 Apr 2025 10:53:24 +0530 Subject: [PATCH 29/39] Update test_conflict.java Signed-off-by: jeet041 --- .../org/springframework/samples/petclinic/test_conflict.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/springframework/samples/petclinic/test_conflict.java b/src/main/java/org/springframework/samples/petclinic/test_conflict.java index e34e3bbdd..bd9c8c9d3 100644 --- a/src/main/java/org/springframework/samples/petclinic/test_conflict.java +++ b/src/main/java/org/springframework/samples/petclinic/test_conflict.java @@ -4,6 +4,6 @@ public class HelloWorld { } public static void helloWorld() { - System.out.println("Hello, World! main"); + System.out.println("Hello, World! dev"); } -} \ No newline at end of file +} From d0f92e6becc2a1cfaf34db949ae0bb21418d0dcd Mon Sep 17 00:00:00 2001 From: AI Resolver Date: Wed, 23 Apr 2025 10:55:10 +0530 Subject: [PATCH 30/39] =?UTF-8?q?=F0=9F=A4=96=20Auto-resolved=20merge=20co?= =?UTF-8?q?nflicts=20with=20Claude=20AI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/springframework/samples/petclinic/test_conflict.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/springframework/samples/petclinic/test_conflict.java b/src/main/java/org/springframework/samples/petclinic/test_conflict.java index bd9c8c9d3..7bd8192d4 100644 --- a/src/main/java/org/springframework/samples/petclinic/test_conflict.java +++ b/src/main/java/org/springframework/samples/petclinic/test_conflict.java @@ -4,6 +4,6 @@ public class HelloWorld { } public static void helloWorld() { - System.out.println("Hello, World! dev"); + System.out.println("Hello, World!"); } -} +} \ No newline at end of file From 39cf6f101d48e70b889fa8828a59fd73c8c13282 Mon Sep 17 00:00:00 2001 From: jeet041 Date: Wed, 23 Apr 2025 15:54:25 +0530 Subject: [PATCH 31/39] Update test_conflict.java Signed-off-by: jeet041 --- .../org/springframework/samples/petclinic/test_conflict.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/springframework/samples/petclinic/test_conflict.java b/src/main/java/org/springframework/samples/petclinic/test_conflict.java index 7bd8192d4..bd9c8c9d3 100644 --- a/src/main/java/org/springframework/samples/petclinic/test_conflict.java +++ b/src/main/java/org/springframework/samples/petclinic/test_conflict.java @@ -4,6 +4,6 @@ public class HelloWorld { } public static void helloWorld() { - System.out.println("Hello, World!"); + System.out.println("Hello, World! dev"); } -} \ No newline at end of file +} From 1960d2e5704cd1798ee7b9e91276d822fc5de0cd Mon Sep 17 00:00:00 2001 From: jeet041 Date: Wed, 23 Apr 2025 16:00:27 +0530 Subject: [PATCH 32/39] Update test_conflict.java Signed-off-by: jeet041 --- .../springframework/samples/petclinic/test_conflict.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/springframework/samples/petclinic/test_conflict.java b/src/main/java/org/springframework/samples/petclinic/test_conflict.java index e34e3bbdd..4a18a0f43 100644 --- a/src/main/java/org/springframework/samples/petclinic/test_conflict.java +++ b/src/main/java/org/springframework/samples/petclinic/test_conflict.java @@ -4,6 +4,8 @@ public class HelloWorld { } public static void helloWorld() { - System.out.println("Hello, World! main"); + System.out.println("Hello, World! dev"); + System.out.println("Hello, World! dev"); + } -} \ No newline at end of file +} From a3b9c39b862c4f2911203f6db6911909d68612c2 Mon Sep 17 00:00:00 2001 From: jeet041 Date: Thu, 24 Apr 2025 00:45:34 +0530 Subject: [PATCH 33/39] Create UserService.java Signed-off-by: jeet041 --- .../samples/petclinic/UserService.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 src/main/java/org/springframework/samples/petclinic/UserService.java diff --git a/src/main/java/org/springframework/samples/petclinic/UserService.java b/src/main/java/org/springframework/samples/petclinic/UserService.java new file mode 100644 index 000000000..f526238e2 --- /dev/null +++ b/src/main/java/org/springframework/samples/petclinic/UserService.java @@ -0,0 +1,14 @@ +// File: UserService.java +public class UserService { + public String getUserName(int userId) { + return "User" + userId; + } + + public boolean isUserActive(int userId) { + return true; + } + + public void updateUserStatus(int userId, boolean isActive) { + // update logic here + } +} From 4463e5fa34140559285e9ac402ed54a5267cf075 Mon Sep 17 00:00:00 2001 From: jeet041 Date: Thu, 24 Apr 2025 00:46:17 +0530 Subject: [PATCH 34/39] Update UserService.java Signed-off-by: jeet041 --- .../springframework/samples/petclinic/UserService.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/springframework/samples/petclinic/UserService.java b/src/main/java/org/springframework/samples/petclinic/UserService.java index f526238e2..c725053c0 100644 --- a/src/main/java/org/springframework/samples/petclinic/UserService.java +++ b/src/main/java/org/springframework/samples/petclinic/UserService.java @@ -1,14 +1,18 @@ // File: UserService.java public class UserService { public String getUserName(int userId) { - return "User" + userId; + return "FeatureBranch_User_" + userId; // Changed logic } public boolean isUserActive(int userId) { - return true; + return false; // Changed logic } public void updateUserStatus(int userId, boolean isActive) { - // update logic here + System.out.println("Feature Branch: Updating user " + userId + " to " + (isActive ? "active" : "inactive")); + } + + public void deactivateUser(int userId) { + System.out.println("Feature Branch: Deactivating user " + userId); } } From c2a6520756d0f380a02fb2ddb0e0e56946c38341 Mon Sep 17 00:00:00 2001 From: jeet041 Date: Thu, 24 Apr 2025 01:07:24 +0530 Subject: [PATCH 35/39] Update UserService.java Signed-off-by: jeet041 --- .../samples/petclinic/UserService.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/springframework/samples/petclinic/UserService.java b/src/main/java/org/springframework/samples/petclinic/UserService.java index c725053c0..c834c3762 100644 --- a/src/main/java/org/springframework/samples/petclinic/UserService.java +++ b/src/main/java/org/springframework/samples/petclinic/UserService.java @@ -1,18 +1,21 @@ -// File: UserService.java public class UserService { public String getUserName(int userId) { - return "FeatureBranch_User_" + userId; // Changed logic + return "User" + userId; } public boolean isUserActive(int userId) { - return false; // Changed logic + return true; } public void updateUserStatus(int userId, boolean isActive) { - System.out.println("Feature Branch: Updating user " + userId + " to " + (isActive ? "active" : "inactive")); + // update logic here } - public void deactivateUser(int userId) { - System.out.println("Feature Branch: Deactivating user " + userId); + public void deleteUser(int userId) { + // deletion logic + } + + public void notifyUser(int userId, String message) { + System.out.println("Sending message: " + message); } } From 9a3e4c308ac1a90198d1e893d362a4ea3070bd9f Mon Sep 17 00:00:00 2001 From: jeet041 Date: Thu, 24 Apr 2025 01:08:14 +0530 Subject: [PATCH 36/39] Update UserService.java Signed-off-by: jeet041 --- .../samples/petclinic/UserService.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/springframework/samples/petclinic/UserService.java b/src/main/java/org/springframework/samples/petclinic/UserService.java index c834c3762..9d1c801d2 100644 --- a/src/main/java/org/springframework/samples/petclinic/UserService.java +++ b/src/main/java/org/springframework/samples/petclinic/UserService.java @@ -1,21 +1,24 @@ public class UserService { public String getUserName(int userId) { - return "User" + userId; + return "[Feature] User: " + userId; } public boolean isUserActive(int userId) { - return true; + System.out.println("Checking user activity in Feature branch"); + return false; } public void updateUserStatus(int userId, boolean isActive) { - // update logic here + System.out.println("Feature branch updating user status"); + // Extra logic here } public void deleteUser(int userId) { - // deletion logic + System.out.println("Feature branch: deleting user " + userId); } public void notifyUser(int userId, String message) { - System.out.println("Sending message: " + message); + System.out.println("[Feature] Notifying user: " + message); + // Extra feature logic } } From 201baee320a9c81c9e61314d5c61ff70336fea87 Mon Sep 17 00:00:00 2001 From: jeet041 Date: Thu, 24 Apr 2025 01:11:54 +0530 Subject: [PATCH 37/39] Update UserService.java Signed-off-by: jeet041 --- .../samples/petclinic/UserService.java | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/springframework/samples/petclinic/UserService.java b/src/main/java/org/springframework/samples/petclinic/UserService.java index 9d1c801d2..cd89d5424 100644 --- a/src/main/java/org/springframework/samples/petclinic/UserService.java +++ b/src/main/java/org/springframework/samples/petclinic/UserService.java @@ -1,24 +1,21 @@ public class UserService { public String getUserName(int userId) { - return "[Feature] User: " + userId; + return "User" + userId; } public boolean isUserActive(int userId) { - System.out.println("Checking user activity in Feature branch"); - return false; + return true; } public void updateUserStatus(int userId, boolean isActive) { - System.out.println("Feature branch updating user status"); - // Extra logic here + // Update user status in DB + } + + public void notifyUser(int userId) { + // Send notification } public void deleteUser(int userId) { - System.out.println("Feature branch: deleting user " + userId); - } - - public void notifyUser(int userId, String message) { - System.out.println("[Feature] Notifying user: " + message); - // Extra feature logic + // Delete user logic } } From 1e7674896ca99daf93b254ed515ec0cfe14e192b Mon Sep 17 00:00:00 2001 From: jeet041 Date: Thu, 24 Apr 2025 01:12:25 +0530 Subject: [PATCH 38/39] Update UserService.java Signed-off-by: jeet041 --- .../springframework/samples/petclinic/UserService.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/springframework/samples/petclinic/UserService.java b/src/main/java/org/springframework/samples/petclinic/UserService.java index cd89d5424..37b4a6e83 100644 --- a/src/main/java/org/springframework/samples/petclinic/UserService.java +++ b/src/main/java/org/springframework/samples/petclinic/UserService.java @@ -1,21 +1,21 @@ public class UserService { public String getUserName(int userId) { - return "User" + userId; + return "Feature: User#" + userId; } public boolean isUserActive(int userId) { - return true; + return false; } public void updateUserStatus(int userId, boolean isActive) { - // Update user status in DB + System.out.println("Feature branch: updating status to " + isActive); } public void notifyUser(int userId) { - // Send notification + System.out.println("Feature branch: notifying user " + userId); } public void deleteUser(int userId) { - // Delete user logic + System.out.println("Feature branch: deleting user " + userId); } } From e63769936d121a601be4668cc00af523e1c0b0c9 Mon Sep 17 00:00:00 2001 From: jeet041 Date: Thu, 24 Apr 2025 01:17:58 +0530 Subject: [PATCH 39/39] Update UserService.java Signed-off-by: jeet041 --- .../org/springframework/samples/petclinic/UserService.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/springframework/samples/petclinic/UserService.java b/src/main/java/org/springframework/samples/petclinic/UserService.java index 37b4a6e83..56db30194 100644 --- a/src/main/java/org/springframework/samples/petclinic/UserService.java +++ b/src/main/java/org/springframework/samples/petclinic/UserService.java @@ -4,15 +4,16 @@ public class UserService { } public boolean isUserActive(int userId) { - return false; + System.out.println("Checking DB for active user"); + return true; } public void updateUserStatus(int userId, boolean isActive) { - System.out.println("Feature branch: updating status to " + isActive); + System.out.println("Main branch: status set to " + isActive); } public void notifyUser(int userId) { - System.out.println("Feature branch: notifying user " + userId); + System.out.println("Main: sending notification to user " + userId); } public void deleteUser(int userId) {