From c9065a7e8e76146a1bd58aa15163a12a455d3c35 Mon Sep 17 00:00:00 2001 From: coderpc <38955299+coderpc@users.noreply.github.com> Date: Thu, 3 May 2018 20:55:43 +0530 Subject: [PATCH 1/3] Extended Branch by user user created the branch --- index.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index 48b1652..31c3ef3 100644 --- a/index.html +++ b/index.html @@ -3,4 +3,5 @@ index page created Conflit Created First Master Development on master - \ No newline at end of file +Extended a Branch by Another User + From dd9cf80285c7599d7c5e6973c846a20aca653a5e Mon Sep 17 00:00:00 2001 From: coderpc <38955299+coderpc@users.noreply.github.com> Date: Thu, 3 May 2018 21:06:01 +0530 Subject: [PATCH 2/3] Extended Branch by user (#1) user created the branch --- index.html | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index f0ef7c8..e1385d5 100644 --- a/index.html +++ b/index.html @@ -4,10 +4,16 @@ First Branch on Developed Master Development on master +Extended a Branch by Another User + + + index page created "--Conflit Was here" First "--Conflit Was here" Development on "--Conflit Was here" This is After Merging Simple Conflicts between Branch2 and Master . And Merging to Master This is how I combined merges of both side Yah Finally Fully merged - \ No newline at end of file +Finaly added feature from new user as well + + From 818ed9196f73c5aef1fa7f2cd809044295073c64 Mon Sep 17 00:00:00 2001 From: Akhil Nadh PC Date: Thu, 3 May 2018 21:06:35 +0530 Subject: [PATCH 3/3] Revert "Extended Branch by user (#1)" This reverts commit dd9cf80285c7599d7c5e6973c846a20aca653a5e. --- index.html | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/index.html b/index.html index e1385d5..f0ef7c8 100644 --- a/index.html +++ b/index.html @@ -4,16 +4,10 @@ First Branch on Developed Master Development on master -Extended a Branch by Another User - - - index page created "--Conflit Was here" First "--Conflit Was here" Development on "--Conflit Was here" This is After Merging Simple Conflicts between Branch2 and Master . And Merging to Master This is how I combined merges of both side Yah Finally Fully merged -Finaly added feature from new user as well - - + \ No newline at end of file