From ab4e89d4516edcde189135c97900bf9049169056 Mon Sep 17 00:00:00 2001
From: Yuvaraj Raghuraj <Yuvaraj.Raghuraj@movate.com>
Date: Thu, 16 Mar 2023 13:21:57 +0530
Subject: [PATCH 1/5] commited for git merge training

---
 assets/css/page.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/css/page.scss b/assets/css/page.scss
index 7aefa0378..2f263eb79 100644
--- a/assets/css/page.scss
+++ b/assets/css/page.scss
@@ -66,7 +66,7 @@ header{
   }
 
   .nav{
-    line-height: 50px;
+    line-height: 150px;
     text-align: center;
 
     li{

From 9000b523d6cd96fdbc25b94bdd55337b25eae888 Mon Sep 17 00:00:00 2001
From: Yuvaraj Raghuraj <Yuvaraj.Raghuraj@movate.com>
Date: Thu, 16 Mar 2023 13:24:42 +0530
Subject: [PATCH 2/5] ted gor git training - conflict resolve

---
 assets/css/page.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/css/page.scss b/assets/css/page.scss
index 7aefa0378..c5ffefcce 100644
--- a/assets/css/page.scss
+++ b/assets/css/page.scss
@@ -66,7 +66,7 @@ header{
   }
 
   .nav{
-    line-height: 50px;
+    line-height: 200px;
     text-align: center;
 
     li{

From b477058bccc4c7aeee82de396c557e97526faf6b Mon Sep 17 00:00:00 2001
From: Yuvaraj Raghuraj <Yuvaraj.Raghuraj@movate.com>
Date: Thu, 16 Mar 2023 14:28:41 +0530
Subject: [PATCH 3/5] ticket-id - brand_name -locale - demo for git operation

---
 assets/css/index.scss | 2 +-
 homepage.html         | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 homepage.html

diff --git a/assets/css/index.scss b/assets/css/index.scss
index 4c73b715d..dd3379ea0 100644
--- a/assets/css/index.scss
+++ b/assets/css/index.scss
@@ -29,7 +29,7 @@ details.flash {
 .octicon { fill: currentColor; }
 
 .site-header {
-  padding-top: 2px;
+  padding-top: 4px;
   padding-bottom: 2px;
 
   .site-header-menu {
diff --git a/homepage.html b/homepage.html
new file mode 100644
index 000000000..917584eb7
--- /dev/null
+++ b/homepage.html
@@ -0,0 +1,7 @@
+<div class="border-bottom border-top py-6 color-bg-subtle text-center">
+  <div class="container-lg py-6 p-responsive">
+    <h1>{{ page.title }}</h1>
+    {% if page.description %}<p class="col-12 col-md-6 mx-auto">{{ page.description }}</p>{% endif %}
+    {% include translation_buttons.html %}
+  </div>
+</div>

From 231f999097b3bfa720b1fe9278ab5ff1b9aa426b Mon Sep 17 00:00:00 2001
From: Yuvaraj Raghuraj <Yuvaraj.Raghuraj@movate.com>
Date: Fri, 17 Mar 2023 13:59:07 +0530
Subject: [PATCH 4/5] Git training demo - git merge conflict

---
 assets/css/page.scss | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/assets/css/page.scss b/assets/css/page.scss
index 2f263eb79..50a9555e1 100644
--- a/assets/css/page.scss
+++ b/assets/css/page.scss
@@ -30,6 +30,9 @@ iframe[src^="//player.vimeo"]{
         margin: 1em;
         padding: 1em;
         opacity: .9;
+		color: $mono-bright;
+        text-decoration: none;
+		font-size: 5em;
       }
 
       &:hover{

From b20fec96caa2ee4ceaf0cff0bc6250eefc68fed3 Mon Sep 17 00:00:00 2001
From: Yuvaraj Raghuraj <Yuvaraj.Raghuraj@movate.com>
Date: Fri, 17 Mar 2023 14:05:04 +0530
Subject: [PATCH 5/5] branch 2 - merge -conflict to resolve  - demo

---
 assets/css/page.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/assets/css/page.scss b/assets/css/page.scss
index c5ffefcce..af5049cfa 100644
--- a/assets/css/page.scss
+++ b/assets/css/page.scss
@@ -30,6 +30,10 @@ iframe[src^="//player.vimeo"]{
         margin: 1em;
         padding: 1em;
         opacity: .9;
+		border-left: 20px solid transparent;
+        border-right: 10px solid transparent;
+        border-top: 20px solid $mono-light;
+        bottom: 20px;
       }
 
       &:hover{