From c2f1e6561c13ae29728df15dc2b3afc50c7dd6d7 Mon Sep 17 00:00:00 2001
From: devops-intellipaat <hemant@intellipaat.com>
Date: Fri, 18 Jan 2019 02:28:17 +0000
Subject: [PATCH 1/6] added feature A

---
 main.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/main.c b/main.c
index 112f3bdc..281db429 100644
--- a/main.c
+++ b/main.c
@@ -5,6 +5,11 @@ Initial Function()
   //Sample Code
 }
 
+feature1()
+{
+  //Sample Code for Feature 1
+}
+
 
 
 }

From ec34fc6de0d11fbf63ca7f49c1c4ecd4963c4a3b Mon Sep 17 00:00:00 2001
From: devops-intellipaat <hemant@intellipaat.com>
Date: Fri, 18 Jan 2019 02:33:59 +0000
Subject: [PATCH 2/6] added feature2

---
 main.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/main.c b/main.c
index 112f3bdc..6cdab63c 100644
--- a/main.c
+++ b/main.c
@@ -5,6 +5,10 @@ Initial Function()
   //Sample Code
 }
 
+feaature2()
+{
+  //Sample Code for Feature 2
+}
 
 
 }

From c41238997219f051eb5ec057fd635c292e4b94af Mon Sep 17 00:00:00 2001
From: HarshiniPR <harshiprana@gmail.com>
Date: Wed, 15 Mar 2023 17:13:26 +0530
Subject: [PATCH 3/6] added security patch

---
 main.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/main.c b/main.c
index 6cdab63c..91bb7801 100644
--- a/main.c
+++ b/main.c
@@ -10,5 +10,10 @@ feaature2()
   //Sample Code for Feature 2
 }
 
+Initial Security()
+{
+ //Sample Code
+}
+
 
 }

From af75e125045299acd68f6286fc283a55aaece5f1 Mon Sep 17 00:00:00 2001
From: HarshiniPR <harshiprana@gmail.com>
Date: Wed, 15 Mar 2023 17:17:50 +0530
Subject: [PATCH 4/6] security patch

---
 main.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/main.c b/main.c
index 281db429..66bac84f 100644
--- a/main.c
+++ b/main.c
@@ -10,6 +10,11 @@ feature1()
   //Sample Code for Feature 1
 }
 
+Initial Security()
+{
+ //Sample Code
+}
+
 
 
 }

From 842a6709657be471d80ed6bd8005c67d260e5c67 Mon Sep 17 00:00:00 2001
From: HarshiniPR <95218914+HarshiniPR@users.noreply.github.com>
Date: Wed, 15 Mar 2023 18:16:31 +0530
Subject: [PATCH 5/6] Create README.md

---
 README.md | 45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 README.md

diff --git a/README.md b/README.md
new file mode 100644
index 00000000..93496598
--- /dev/null
+++ b/README.md
@@ -0,0 +1,45 @@
+# merge-conflict
+
+<img width="457" alt="image" src="https://user-images.githubusercontent.com/95218914/225309419-5707ef9a-6474-4675-a259-94671ad881ed.png">
+
+<img width="453" alt="image" src="https://user-images.githubusercontent.com/95218914/225309496-14d55120-a6df-4885-8032-0d09fd27f00b.png">
+Step-wise:
+Step-1: Add remote url to repository:
+$ git remote add upstream https://github.com/HarshiniPR/merge-conflict.git
+
+Step-2: Fetch changes from upstream master branch
+$ git fetch upstream master
+ 
+Step-3. Create new branch Feature 1 and switch to it
+$ git checkout -b Feature1
+
+Step-4. Merge master and Feature 1 branches
+$ git merge upstream/master
+
+Step-5. Push changes to Feature1 branch
+$ git remote -v
+$ git push upstream Feature1
+
+Step-6. Create new branch Feature 2 and switch to it
+$ git checkout -b Feature2
+
+Step-7. Merge master and Feature 2 branches
+$ git merge upstream/master
+
+Step-8. Push changes to Feature 2 branch
+$ git push upstream Feature2
+
+Step-9. Switch to master branch
+$ git checkout master
+
+Step-10. Merge master and Feature 1 branches
+$ git merge Feature1
+
+Step-11. Merge master and Feature 2 branches
+$ git merge Feature2
+
+Step-12. Push changes to master branch
+$ git push upstream master
+
+Step-13. Push all branches to github
+$ git push --all upstream

From 44d39a469b6cd77c13be4c150ab35628423d0174 Mon Sep 17 00:00:00 2001
From: HarshiniPR <95218914+HarshiniPR@users.noreply.github.com>
Date: Wed, 15 Mar 2023 18:17:32 +0530
Subject: [PATCH 6/6] Update README.md

---
 README.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/README.md b/README.md
index 93496598..abb4ad48 100644
--- a/README.md
+++ b/README.md
@@ -5,41 +5,55 @@
 <img width="453" alt="image" src="https://user-images.githubusercontent.com/95218914/225309496-14d55120-a6df-4885-8032-0d09fd27f00b.png">
 Step-wise:
 Step-1: Add remote url to repository:
+
 $ git remote add upstream https://github.com/HarshiniPR/merge-conflict.git
 
 Step-2: Fetch changes from upstream master branch
+
 $ git fetch upstream master
  
 Step-3. Create new branch Feature 1 and switch to it
+
 $ git checkout -b Feature1
 
 Step-4. Merge master and Feature 1 branches
+
 $ git merge upstream/master
 
 Step-5. Push changes to Feature1 branch
+
 $ git remote -v
+
 $ git push upstream Feature1
 
 Step-6. Create new branch Feature 2 and switch to it
+
 $ git checkout -b Feature2
 
 Step-7. Merge master and Feature 2 branches
+
 $ git merge upstream/master
 
 Step-8. Push changes to Feature 2 branch
+
 $ git push upstream Feature2
 
 Step-9. Switch to master branch
+
 $ git checkout master
 
 Step-10. Merge master and Feature 1 branches
+
 $ git merge Feature1
 
 Step-11. Merge master and Feature 2 branches
+
 $ git merge Feature2
 
 Step-12. Push changes to master branch
+
 $ git push upstream master
 
 Step-13. Push all branches to github
+
 $ git push --all upstream