From 9235ce7dc001c75e831c9511915346aaa8e61d06 Mon Sep 17 00:00:00 2001 From: Vicky Date: Wed, 16 Nov 2016 12:08:39 +0000 Subject: [PATCH 01/14] test --- .../classes/com/hmkcode/junit/Math.class | Bin 929 -> 929 bytes .../com/hmkcode/junit/MathTest.class | Bin 2143 -> 2422 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/simple-junit/target/classes/com/hmkcode/junit/Math.class b/simple-junit/target/classes/com/hmkcode/junit/Math.class index 7af1fc90a4bb88071affc1b65e21706ed538156f..6198d41d568157126902be41cc501f7ee93da57b 100644 GIT binary patch delta 17 ZcmZ3;zL1^c)W2Q(7#J8#Hge2l1^_(N1|k3e delta 17 ZcmZ3;zL1^c)W2Q(7#J9gHge2l1^_(D1|R?c diff --git a/simple-junit/target/test-classes/com/hmkcode/junit/MathTest.class b/simple-junit/target/test-classes/com/hmkcode/junit/MathTest.class index 85c0ebbda81bd2f9eea61a629bb8ce65a9488cf6..4fbe8d54d808a06af23ded910e46669cbcf2fcde 100644 GIT binary patch literal 2422 zcmeHI-A)rh6h2cbZI?o!iXtEmirQ+ViQz_TOo%@TW~m7+7%!*0LwD-#PBS~(gg5Xh zd<_##^xh}(%6O(OV8Y5a3h~B^_UxJY=9_QMoO9;u_m7_eU<2+IAV*-)kwL=?-a69d zjeZ;o-PmT@>+nbyAWvYn&xWkwv#{5A)$Maf6PWJ#vdjFA2)K;VFWJdwlfcqW9BQ1{ z3Wp*RU7v4;q0~$Z8Ab#q?VZ@?2+Ie!2Z04UeRo7mJ{G9u34w`PeGeBrMSTUR5U3mr zdajgIMVKQK-*!XABk2#hOObLQ{Lz+lpd@MtqDRy!bv#Z*Fpx@9se0?9vr>l{eYDHz z;rjo;QFuHSI2aN=PJ~XyVnVzY+DqY~T2e;!!GK$(m%Dh|8yO&zJQfe*9l$ zZ}mc{vNUC6TlOyhp1{;jz_lk`ise#sWsGH2ry`LyUNrNjI^riAg6!Myea_Ne9G z^d!>}u`kVOw3|`Hm2OGhihbX-wPdnr|4fKx5v~z<6fRK`#gM2@-JrGJYF8qTmWFpe1k>M{*;63+*C~E#dDZ<8lh)N-E>Z z5u;IT7*DcYPhne2Wn2A2w)?4UH^yMQnWF7MD%-6w*wRk=Foi7#w=q&VxC3|5<}q@$ EAE+FmT>t<8 literal 2143 zcmb7F+fv(B6kW27WsC^mm_SGXg1+tXN5>vjU zGyQ=)ccuxRcBUWDFX~g%btHk!)O02=(z$3~)?RC$f=gVd4@vNsQvEFiX=fyPm5JLc%o#1BlC*?*|792uT|Hbs>-4yq{_CYnl;ri#5&xJxlMyr-n^t1!7%F?b2+ZI+q&a!+3uES zniq))&6wew7iCf6Zm}8u-Pmn=D4tWZwUd%U_ zEq7I}xQ<~piak4l?nObjEYMcGRswe zDpJO0S@dP11C%nx4LWAYnXP%JongSQV4l#@8~w;`tB~HPx2p zFn?ilF{;}8EnqhI<-f>h#j66#j*>aL?|u5de0 z(C~F@hnoaeu{}rA9~t8G4WC_D^P-D+rTG|wyUg({OLq#qg`OI2lN~nTOViJ&UD$ZS zt7Wl>SswN%p+z|Ia^PF$N{m5s^A-r#ymGiZ%vBXJ&VaY_r?`^;1EafRL!DEkUSgc9 ziQQ9Ne~GDIX%WFqzEiXZ#`&J){062upXQE;$0+=t;V2=)ors@5$#Ir@Z}Slu@B8?8 zz*6tzf5TJKv>?VdCQE+{h|z6k){6l?znpumI+ zZwTP?z5rg3fdOJ&V(pJv{6^|gu7k%{_;j$&qHq`~|bqZ_y> From a6f0582e4744a584f2e822386e16d7a136be64c8 Mon Sep 17 00:00:00 2001 From: Vicky Date: Wed, 16 Nov 2016 12:09:44 +0000 Subject: [PATCH 02/14] Commit1 --- simple-junit/src/test/java/com/hmkcode/junit/Commit1.java | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 simple-junit/src/test/java/com/hmkcode/junit/Commit1.java diff --git a/simple-junit/src/test/java/com/hmkcode/junit/Commit1.java b/simple-junit/src/test/java/com/hmkcode/junit/Commit1.java new file mode 100644 index 00000000..805ecde2 --- /dev/null +++ b/simple-junit/src/test/java/com/hmkcode/junit/Commit1.java @@ -0,0 +1,5 @@ +package com.hmkcode.junit; + +public class Commit1 { + +} From 2ed0bc3534372ffd54dc504831d98b46649851b4 Mon Sep 17 00:00:00 2001 From: Vicky Date: Wed, 16 Nov 2016 12:10:10 +0000 Subject: [PATCH 03/14] Commit2 --- simple-junit/src/test/java/com/hmkcode/junit/Commit2.java | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 simple-junit/src/test/java/com/hmkcode/junit/Commit2.java diff --git a/simple-junit/src/test/java/com/hmkcode/junit/Commit2.java b/simple-junit/src/test/java/com/hmkcode/junit/Commit2.java new file mode 100644 index 00000000..38fe1ca2 --- /dev/null +++ b/simple-junit/src/test/java/com/hmkcode/junit/Commit2.java @@ -0,0 +1,5 @@ +package com.hmkcode.junit; + +public class Commit2 { + +} From 802fb0d00f4d785308f39baff6f8b6e6a73e9d7c Mon Sep 17 00:00:00 2001 From: Vicky Date: Wed, 16 Nov 2016 12:11:29 +0000 Subject: [PATCH 04/14] Commit 2.3 --- simple-junit/src/test/java/com/hmkcode/junit/Commit2.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/simple-junit/src/test/java/com/hmkcode/junit/Commit2.java b/simple-junit/src/test/java/com/hmkcode/junit/Commit2.java index 38fe1ca2..6699a819 100644 --- a/simple-junit/src/test/java/com/hmkcode/junit/Commit2.java +++ b/simple-junit/src/test/java/com/hmkcode/junit/Commit2.java @@ -1,5 +1,7 @@ package com.hmkcode.junit; public class Commit2 { - + public static void main(String[] args) { + System.out.println("Commit 3"); + } } From d603891b870ad42b0067757d7f63f28afb8aea74 Mon Sep 17 00:00:00 2001 From: Vicky Date: Wed, 16 Nov 2016 13:42:16 +0000 Subject: [PATCH 05/14] Commint 2.4 --- simple-junit/src/test/java/com/hmkcode/junit/Commit2.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/simple-junit/src/test/java/com/hmkcode/junit/Commit2.java b/simple-junit/src/test/java/com/hmkcode/junit/Commit2.java index 6699a819..a2278714 100644 --- a/simple-junit/src/test/java/com/hmkcode/junit/Commit2.java +++ b/simple-junit/src/test/java/com/hmkcode/junit/Commit2.java @@ -1,7 +1,8 @@ package com.hmkcode.junit; +import java.util.function.Consumer; + public class Commit2 { public static void main(String[] args) { - System.out.println("Commit 3"); } } From 898c3915d30419bc27dcaf3917241d975d464137 Mon Sep 17 00:00:00 2001 From: Vicky Date: Wed, 16 Nov 2016 13:44:21 +0000 Subject: [PATCH 06/14] Commit 3 --- simple-junit/src/test/java/com/hmkcode/junit/Commint3.java | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 simple-junit/src/test/java/com/hmkcode/junit/Commint3.java diff --git a/simple-junit/src/test/java/com/hmkcode/junit/Commint3.java b/simple-junit/src/test/java/com/hmkcode/junit/Commint3.java new file mode 100644 index 00000000..ceda5bb6 --- /dev/null +++ b/simple-junit/src/test/java/com/hmkcode/junit/Commint3.java @@ -0,0 +1,7 @@ +package com.hmkcode.junit; + +public class Commint3 { + public static void main(String[] args) { + System.out.println("Commit 3"); + } +} From 0483ce27621fe80c69bf77a7e955d20f76a55bf1 Mon Sep 17 00:00:00 2001 From: Vicky Date: Thu, 17 Nov 2016 06:20:59 +0000 Subject: [PATCH 07/14] commit --- simple-junit/src/test/java/com/hmkcode/junit/Commit5.java | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 simple-junit/src/test/java/com/hmkcode/junit/Commit5.java diff --git a/simple-junit/src/test/java/com/hmkcode/junit/Commit5.java b/simple-junit/src/test/java/com/hmkcode/junit/Commit5.java new file mode 100644 index 00000000..d6617874 --- /dev/null +++ b/simple-junit/src/test/java/com/hmkcode/junit/Commit5.java @@ -0,0 +1,5 @@ +package com.hmkcode.junit; + +public class Commit5 { + +} From 5bd518a7969c7d313a1d1dec09486a4ce909e56c Mon Sep 17 00:00:00 2001 From: Vicky Date: Thu, 17 Nov 2016 06:25:36 +0000 Subject: [PATCH 08/14] Commit 2.5 @karjunsharma @SantoshOpenxcell Please review my code --- simple-junit/src/test/java/com/hmkcode/junit/Commit2.java | 1 + 1 file changed, 1 insertion(+) diff --git a/simple-junit/src/test/java/com/hmkcode/junit/Commit2.java b/simple-junit/src/test/java/com/hmkcode/junit/Commit2.java index a2278714..83b337eb 100644 --- a/simple-junit/src/test/java/com/hmkcode/junit/Commit2.java +++ b/simple-junit/src/test/java/com/hmkcode/junit/Commit2.java @@ -4,5 +4,6 @@ public class Commit2 { public static void main(String[] args) { + System.out.println("Conflict check 2"); } } From e028658a2207505a28bca3748dd8b47855bf461f Mon Sep 17 00:00:00 2001 From: karjunsharma Date: Thu, 17 Nov 2016 06:30:29 +0000 Subject: [PATCH 09/14] Merge conflict test i want to test merge conflict --- simple-junit/src/test/java/com/hmkcode/junit/Commit2.java | 1 + 1 file changed, 1 insertion(+) diff --git a/simple-junit/src/test/java/com/hmkcode/junit/Commit2.java b/simple-junit/src/test/java/com/hmkcode/junit/Commit2.java index a2278714..5638958c 100644 --- a/simple-junit/src/test/java/com/hmkcode/junit/Commit2.java +++ b/simple-junit/src/test/java/com/hmkcode/junit/Commit2.java @@ -4,5 +4,6 @@ public class Commit2 { public static void main(String[] args) { + asdasdaslkdjal skdjalskdj asldjasdas } } From 7d69015eba69afc2b5ade12b7452044353825cef Mon Sep 17 00:00:00 2001 From: Vicky Date: Thu, 17 Nov 2016 06:46:33 +0000 Subject: [PATCH 10/14] Conflict resolved --- simple-junit/src/test/java/com/hmkcode/junit/Commit2.java | 1 + 1 file changed, 1 insertion(+) diff --git a/simple-junit/src/test/java/com/hmkcode/junit/Commit2.java b/simple-junit/src/test/java/com/hmkcode/junit/Commit2.java index 5638958c..2c219c1b 100644 --- a/simple-junit/src/test/java/com/hmkcode/junit/Commit2.java +++ b/simple-junit/src/test/java/com/hmkcode/junit/Commit2.java @@ -4,6 +4,7 @@ public class Commit2 { public static void main(String[] args) { + System.out.println("Conflict check 2"); asdasdaslkdjal skdjalskdj asldjasdas } } From 69024ac12ede0e55654d7cd7ade43b4be1120870 Mon Sep 17 00:00:00 2001 From: Vicky Date: Thu, 17 Nov 2016 06:49:59 +0000 Subject: [PATCH 11/14] Conflict resolve @karjunsharma @SantoshOpenxcell please check the conflict resolve --- simple-junit/src/test/java/com/hmkcode/junit/Commit2.java | 1 - 1 file changed, 1 deletion(-) diff --git a/simple-junit/src/test/java/com/hmkcode/junit/Commit2.java b/simple-junit/src/test/java/com/hmkcode/junit/Commit2.java index 2c219c1b..83b337eb 100644 --- a/simple-junit/src/test/java/com/hmkcode/junit/Commit2.java +++ b/simple-junit/src/test/java/com/hmkcode/junit/Commit2.java @@ -5,6 +5,5 @@ public class Commit2 { public static void main(String[] args) { System.out.println("Conflict check 2"); - asdasdaslkdjal skdjalskdj asldjasdas } } From e6bc2364b9bc84c1700305ba770622d95942613d Mon Sep 17 00:00:00 2001 From: Vicky Date: Thu, 17 Nov 2016 06:55:44 +0000 Subject: [PATCH 12/14] Conflict @karjunsharma @SantoshOpnexcell arjun's conflict resolved "asdasdaslkdjal skdjalskdj asldjasdas" --- simple-junit/src/test/java/com/hmkcode/junit/Commit2.java | 1 + 1 file changed, 1 insertion(+) diff --git a/simple-junit/src/test/java/com/hmkcode/junit/Commit2.java b/simple-junit/src/test/java/com/hmkcode/junit/Commit2.java index 83b337eb..53177bc2 100644 --- a/simple-junit/src/test/java/com/hmkcode/junit/Commit2.java +++ b/simple-junit/src/test/java/com/hmkcode/junit/Commit2.java @@ -5,5 +5,6 @@ public class Commit2 { public static void main(String[] args) { System.out.println("Conflict check 2"); + System.out.println("Arjun changes: asdasdaslkdjal skdjalskdj asldjasdas"); } } From 6fbe542062250fcf6218832c9d1efa2fded3fd05 Mon Sep 17 00:00:00 2001 From: Arjun Sharma Date: Thu, 17 Nov 2016 12:46:54 +0000 Subject: [PATCH 13/14] patch 1 applied --- .../test/java/com/hmkcode/junit/Commit2.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/simple-junit/src/test/java/com/hmkcode/junit/Commit2.java b/simple-junit/src/test/java/com/hmkcode/junit/Commit2.java index 83b337eb..e274b380 100644 --- a/simple-junit/src/test/java/com/hmkcode/junit/Commit2.java +++ b/simple-junit/src/test/java/com/hmkcode/junit/Commit2.java @@ -1,9 +1,10 @@ -package com.hmkcode.junit; - -import java.util.function.Consumer; - -public class Commit2 { - public static void main(String[] args) { - System.out.println("Conflict check 2"); - } -} +package com.hmkcode.junit; + +import java.util.function.Consumer; + +public class Commit2 { + public static void main(String[] args) { + System.out.println("Conflict check 2"); + System.out.println("Arjun changes: asdasdaslkdjal skdjalskdj asldjasdas"); + } +} From 18413a32497de7e3e86dbfe639853eea1a34a249 Mon Sep 17 00:00:00 2001 From: Arjun Sharma Date: Thu, 17 Nov 2016 12:49:09 +0000 Subject: [PATCH 14/14] patch 2 --- simple-junit/src/test/java/com/hmkcode/junit/Commit2.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/simple-junit/src/test/java/com/hmkcode/junit/Commit2.java b/simple-junit/src/test/java/com/hmkcode/junit/Commit2.java index e274b380..fd8fc435 100644 --- a/simple-junit/src/test/java/com/hmkcode/junit/Commit2.java +++ b/simple-junit/src/test/java/com/hmkcode/junit/Commit2.java @@ -4,7 +4,7 @@ public class Commit2 { public static void main(String[] args) { - System.out.println("Conflict check 2"); - System.out.println("Arjun changes: asdasdaslkdjal skdjalskdj asldjasdas"); + System.out.println("Conflict check 2"); + System.out.println("Arjun changes: asdasdaslkdjal skdjalskdj asldjasdas"); } }