diff --git a/index.html b/index.html index 644beb9..a335a8c 100644 --- a/index.html +++ b/index.html @@ -4,12 +4,22 @@ 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 + userBranch +Finaly added feature from new user as well + Branch of user Ready to Commit to Master of Origin + +Final Merge +