1109 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
jeet041	26d22369f6	Update UserService.java ... Signed-off-by: jeet041 <mahorjitendra@gmail.com>	2025-05-11 19:26:48 +05:30
jeet041	128883eeda	Update UserService.java ... Signed-off-by: jeet041 <mahorjitendra@gmail.com>	2025-05-11 19:25:06 +05:30
jeet041	1de90b19c6	Update test_conflict.java ... Signed-off-by: jeet041 <mahorjitendra@gmail.com>	2025-05-11 18:36:23 +05:30
jeet041	5da2018a4a	Update test_conflict.java ... Signed-off-by: jeet041 <mahorjitendra@gmail.com>	2025-05-11 18:33:36 +05:30
jeet041	e050e9f3be	🔀 Merged via GitHub API ... Update test_conflict.java	2025-05-09 16:35:21 +05:30
Yasaswini-3004	4bd8142776	🤖 Applied provided resolved content to 2 merge conflicts	2025-05-09 11:05:17 +00:00
jeet041	a51060eb87	Update UserService.java ... Signed-off-by: jeet041 <mahorjitendra@gmail.com>	2025-05-09 13:04:18 +05:30
jeet041	aa9228bf8b	Update UserService.java ... Signed-off-by: jeet041 <mahorjitendra@gmail.com>	2025-05-09 13:03:57 +05:30
jeet041	7c88063cf0	Update test_conflict.java ... Signed-off-by: jeet041 <mahorjitendra@gmail.com>	2025-05-09 10:34:59 +05:30
jeet041	be98d82213	Update test_conflict.java ... Signed-off-by: jeet041 <mahorjitendra@gmail.com>	2025-05-09 10:34:34 +05:30
jeet041	718057e961	🔀 Merged via GitHub API ... Update test_conflict.java	2025-05-09 10:27:51 +05:30
Jitendra-Mahor_brillio	8b44c6f81b	🤖 Applied provided resolved content to 1 merge conflicts	2025-05-09 10:27:46 +05:30
jeet041	da61c5b874	Update test_conflict.java ... Signed-off-by: jeet041 <mahorjitendra@gmail.com>	2025-05-09 10:23:51 +05:30
jeet041	29aa03fd53	Update test_conflict.java ... Signed-off-by: jeet041 <mahorjitendra@gmail.com>	2025-05-09 10:23:24 +05:30
jeet041	6cc3d109ee	🔀 Merged via GitHub API ... Update test_conflict.java	2025-05-09 10:21:15 +05:30
Jitendra-Mahor_brillio	9be2e28631	🤖 Applied provided resolved content to 1 merge conflicts	2025-05-09 10:21:10 +05:30
jeet041	35aa30cbc4	Update test_conflict.java ... Signed-off-by: jeet041 <mahorjitendra@gmail.com>	2025-05-09 01:07:37 +05:30
jeet041	822f5c1034	Update test_conflict.java ... Signed-off-by: jeet041 <mahorjitendra@gmail.com>	2025-05-09 01:07:09 +05:30
jeet041	587bb0fef2	🔀 Merged via GitHub API ... Update test_conflict.java	2025-05-08 02:05:27 +05:30
Jitendra-Mahor_brillio	8f13c754d1	🤖 Auto-resolved merge conflicts with Claude AI	2025-05-08 02:05:21 +05:30
jeet041	2c418a74d5	Update test_conflict.java ... Signed-off-by: jeet041 <mahorjitendra@gmail.com>	2025-05-06 21:32:55 +05:30
jeet041	e43292693b	Update test_conflict.java ... Signed-off-by: jeet041 <mahorjitendra@gmail.com>	2025-05-06 21:32:34 +05:30
Yasaswini-3004	4aded40aec	🤖 Auto-resolved merge conflicts with Claude AI	2025-05-02 13:39:47 +00:00
jeet041	2726ba45fc	Update test_conflict.java ... Signed-off-by: jeet041 <mahorjitendra@gmail.com>	2025-05-02 19:01:20 +05:30
jeet041	88c4785df3	Update test_conflict.java ... Signed-off-by: jeet041 <mahorjitendra@gmail.com>	2025-05-02 19:00:53 +05:30
Yasaswini-3004	1ee1cfd550	🤖 Auto-resolved merge conflicts with Claude AI	2025-05-02 12:13:04 +00:00
jeet041	266a31c081	Update test_conflict.java ... Signed-off-by: jeet041 <mahorjitendra@gmail.com>	2025-05-02 17:40:52 +05:30
jeet041	92f794a10f	Update test_conflict.java ... Signed-off-by: jeet041 <mahorjitendra@gmail.com>	2025-05-02 17:40:35 +05:30
jeet041	23ec1e37d2	🔀 Merged via GitHub API ... Dev conflict	2025-05-02 17:30:05 +05:30
Yasaswini-3004	c8a5037f10	🤖 Auto-resolved merge conflicts with Claude AI	2025-05-02 11:19:54 +00:00
jeet041	41785faf66	Update test_conflict.java ... Signed-off-by: jeet041 <mahorjitendra@gmail.com>	2025-05-02 16:27:30 +05:30
jeet041	ba5b7eed50	Update test_conflict.java ... Signed-off-by: jeet041 <mahorjitendra@gmail.com>	2025-05-02 16:26:58 +05:30
Jitendra-Mahor_brillio	e16a1d8af2	🤖 Auto-resolved merge conflicts with Claude AI	2025-05-02 16:05:51 +05:30
jeet041	8148e187d1	Update test_conflict.java ... Signed-off-by: jeet041 <mahorjitendra@gmail.com>	2025-04-28 16:51:06 +05:30
jeet041	28b0a00167	Update test_conflict.java ... Signed-off-by: jeet041 <mahorjitendra@gmail.com>	2025-04-28 16:50:08 +05:30
jeet041	2a51a43bac	Update test_conflict.java ... Signed-off-by: jeet041 <mahorjitendra@gmail.com>	2025-04-28 16:49:41 +05:30
jeet041	bef590bd65	🔀 Merged via GitHub API ... Test for AI Auto Merge	2025-04-24 14:14:44 +05:30
Jitendra-Mahor_brillio	8a98c814aa	🤖 Auto-resolved merge conflicts with Claude AI	2025-04-24 14:14:38 +05:30
jeet041	ee4252d3c8	Update test_conflict.java ... Signed-off-by: jeet041 <mahorjitendra@gmail.com>	2025-04-24 14:10:45 +05:30
jeet041	9c7a5075cf	Update test_conflict.java ... Signed-off-by: jeet041 <mahorjitendra@gmail.com>	2025-04-24 14:10:21 +05:30
jeet041	6f6603e2f3	🔀 Merged via GitHub API ... Update test_conflict.java	2025-04-24 14:01:57 +05:30
Jitendra-Mahor_brillio	98901ee25b	🤖 Auto-resolved merge conflicts with Claude AI	2025-04-24 14:01:51 +05:30
jeet041	bb4becce4c	Update test_conflict.java ... Signed-off-by: jeet041 <mahorjitendra@gmail.com>	2025-04-24 13:49:57 +05:30
jeet041	65ebc84e48	Update test_conflict.java ... Signed-off-by: jeet041 <mahorjitendra@gmail.com>	2025-04-24 13:49:02 +05:30
jeet041	e7947bbc0a	🔀 Merged via GitHub API ... Update test_conflict.java	2025-04-24 12:25:26 +05:30
Jitendra-Mahor_brillio	63de9a10f2	🤖 Auto-resolved merge conflicts with Claude AI	2025-04-24 12:25:20 +05:30
jeet041	28c66c2b7e	Update test_conflict.java ... Signed-off-by: jeet041 <mahorjitendra@gmail.com>	2025-04-24 12:24:15 +05:30
jeet041	bbf41d640b	Update test_conflict.java ... Signed-off-by: jeet041 <mahorjitendra@gmail.com>	2025-04-24 12:23:46 +05:30
Jitendra-Mahor_brillio	5c3f8b8c89	🤖 Auto-resolved merge conflicts with Claude AI	2025-04-24 12:11:03 +05:30
jeet041	7617d8ab37	Update test_conflict.java ... Signed-off-by: jeet041 <mahorjitendra@gmail.com>	2025-04-24 11:52:09 +05:30