From 1cd5cd56c97e91fa16866525a9e4574a1c510b80 Mon Sep 17 00:00:00 2001
From: dheerajkumarkallem
 <47894640+dheerajkumarkallem@users.noreply.github.com>
Date: Thu, 22 Sep 2022 23:59:17 +0530
Subject: [PATCH 01/20] Update pom.xml

---
 stockmanager/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stockmanager/pom.xml b/stockmanager/pom.xml
index ca2beaf..a8ecd8f 100644
--- a/stockmanager/pom.xml
+++ b/stockmanager/pom.xml
@@ -78,7 +78,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>versions-maven-plugin</artifactId>
-                <version>2.7</version>
+                <version>3.3.1</version>
             </plugin>
         </plugins>
     </build>

From 5ae5318f8b4bfc478b3ddbd8101829cccdf991a2 Mon Sep 17 00:00:00 2001
From: root <root@ip-172-31-10-122.ap-south-1.compute.internal>
Date: Tue, 18 Jul 2023 17:38:10 +0000
Subject: [PATCH 02/20] mychange

---
 kubernetes/stockmanager-service.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kubernetes/stockmanager-service.yaml b/kubernetes/stockmanager-service.yaml
index e880acc..9b114b8 100644
--- a/kubernetes/stockmanager-service.yaml
+++ b/kubernetes/stockmanager-service.yaml
@@ -40,4 +40,4 @@ spec:
             path: /health
             port: 8030
           initialDelaySeconds: 30
-          timeoutSeconds: 1
+         nothing 

From f1ed05244c7874b97d69fc188e03e38051851dbf Mon Sep 17 00:00:00 2001
From: Dheeraj <17j45a0502@gmail.com>
Date: Thu, 20 Jul 2023 08:59:54 +0000
Subject: [PATCH 03/20] no

---
 kubernetes/a | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 kubernetes/a

diff --git a/kubernetes/a b/kubernetes/a
new file mode 100644
index 0000000..359b6a8
--- /dev/null
+++ b/kubernetes/a
@@ -0,0 +1 @@
+ijjjjjjjjjjjjjjjjj

From 0c17bb7f8cc91ea25e96adfaf37a65725b471de8 Mon Sep 17 00:00:00 2001
From: Dheeraj <17j45a0502@gmail.com>
Date: Thu, 20 Jul 2023 09:01:38 +0000
Subject: [PATCH 04/20] gst

---
 kubernetes/a | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kubernetes/a b/kubernetes/a
index 359b6a8..b8a6316 100644
--- a/kubernetes/a
+++ b/kubernetes/a
@@ -1 +1,2 @@
-ijjjjjjjjjjjjjjjjj
+ijjjjjjjjjjjjjjjj
+iiiiiij

From 0fac6bcaf38a17d785144d0a79a668cab3b5bbaa Mon Sep 17 00:00:00 2001
From: Dheeraj <17j45a0502@gmail.com>
Date: Thu, 20 Jul 2023 17:08:18 +0000
Subject: [PATCH 05/20] want back my file

---
 kubernetes/a | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 kubernetes/a

diff --git a/kubernetes/a b/kubernetes/a
deleted file mode 100644
index b8a6316..0000000
--- a/kubernetes/a
+++ /dev/null
@@ -1,2 +0,0 @@
-ijjjjjjjjjjjjjjjj
-iiiiiij

From 60240461d75e28861961ca98c0bc278ca2d8b052 Mon Sep 17 00:00:00 2001
From: Dheeraj <17j45a0502@gmail.com>
Date: Fri, 21 Jul 2023 08:28:51 +0000
Subject: [PATCH 06/20] gg

---
 kubernetes/shopfront-service.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kubernetes/shopfront-service.yaml b/kubernetes/shopfront-service.yaml
index bdd5118..7dc3803 100644
--- a/kubernetes/shopfront-service.yaml
+++ b/kubernetes/shopfront-service.yaml
@@ -1,4 +1,4 @@
----
+iiii---
 apiVersion: v1
 kind: Service
 metadata:

From ca7b10f6064736a7752533ae76584a21609be824 Mon Sep 17 00:00:00 2001
From: Dheeraj <17j45a0502@gmail.com>
Date: Fri, 21 Jul 2023 08:55:41 +0000
Subject: [PATCH 07/20] ggg

---
 kubernetes/a | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 kubernetes/a

diff --git a/kubernetes/a b/kubernetes/a
new file mode 100644
index 0000000..fbb63da
--- /dev/null
+++ b/kubernetes/a
@@ -0,0 +1 @@
+iiiiiiiiiiiiiiiiii

From 604e708de03527e650a864b33edb21de50fb354c Mon Sep 17 00:00:00 2001
From: Dheeraj <17j45a0502@gmail.com>
Date: Fri, 21 Jul 2023 08:59:10 +0000
Subject: [PATCH 08/20] gg

---
 kubernetes/a | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 kubernetes/a

diff --git a/kubernetes/a b/kubernetes/a
new file mode 100644
index 0000000..094f491
--- /dev/null
+++ b/kubernetes/a
@@ -0,0 +1,3 @@
+iiii
+iii
+iii

From 7bd69e659d0b33b0ae80efde14a41a061cf51bfe Mon Sep 17 00:00:00 2001
From: Dheeraj <17j45a0502@gmail.com>
Date: Fri, 21 Jul 2023 09:07:48 +0000
Subject: [PATCH 09/20] ggg

---
 kubernetes/a | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/kubernetes/a b/kubernetes/a
index ab296ce..b0d54ee 100644
--- a/kubernetes/a
+++ b/kubernetes/a
@@ -1,7 +1 @@
-<<<<<<< HEAD
-
-
-iiiiii
-=======
-iiiiiiiiiiiiiiiiii
->>>>>>> demor
+iiiiiiiiiiiiii

From caae4abcd1b16e1c245ab0d5f429a5519f000372 Mon Sep 17 00:00:00 2001
From: Dheeraj <17j45a0502@gmail.com>
Date: Fri, 21 Jul 2023 09:08:36 +0000
Subject: [PATCH 10/20] fff

---
 kubernetes/a | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kubernetes/a b/kubernetes/a
index b0d54ee..804502f 100644
--- a/kubernetes/a
+++ b/kubernetes/a
@@ -1 +1 @@
-iiiiiiiiiiiiii
+123123123123123123123123123123123123

From d1984b442bea78981fd77010e65e40e3e342a30b Mon Sep 17 00:00:00 2001
From: Dheeraj <17j45a0502@gmail.com>
Date: Fri, 21 Jul 2023 09:09:20 +0000
Subject: [PATCH 11/20] ggggg

---
 kubernetes/a | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kubernetes/a b/kubernetes/a
index fbb63da..48082f7 100644
--- a/kubernetes/a
+++ b/kubernetes/a
@@ -1 +1 @@
-iiiiiiiiiiiiiiiiii
+12

From da2ad50ad61f088266e03233ea24a4b9c414dd01 Mon Sep 17 00:00:00 2001
From: Dheeraj <17j45a0502@gmail.com>
Date: Fri, 21 Jul 2023 09:11:28 +0000
Subject: [PATCH 12/20] aaa

---
 kubernetes/a | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kubernetes/a b/kubernetes/a
index d00491f..48082f7 100644
--- a/kubernetes/a
+++ b/kubernetes/a
@@ -1 +1 @@
-1
+12

From 423bf9094cbda8b6570667e817d2141ddb2215bb Mon Sep 17 00:00:00 2001
From: Dheeraj <17j45a0502@gmail.com>
Date: Fri, 21 Jul 2023 09:12:25 +0000
Subject: [PATCH 13/20] tew

---
 kubernetes/a | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kubernetes/a b/kubernetes/a
index 48082f7..e56e15b 100644
--- a/kubernetes/a
+++ b/kubernetes/a
@@ -1 +1 @@
-12
+12345

From 7b1e967cb7e0a03105ef6c099a253dfce6add822 Mon Sep 17 00:00:00 2001
From: Dheeraj <17j45a0502@gmail.com>
Date: Fri, 21 Jul 2023 09:52:49 +0000
Subject: [PATCH 14/20] rebase

---
 kubernetes/a | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kubernetes/a b/kubernetes/a
index e56e15b..28d1445 100644
--- a/kubernetes/a
+++ b/kubernetes/a
@@ -1 +1 @@
-12345
+123456789

From 1717299b06983d3ea7c6af2e584baeb0b3b0421d Mon Sep 17 00:00:00 2001
From: Dheeraj <17j45a0502@gmail.com>
Date: Fri, 21 Jul 2023 09:55:26 +0000
Subject: [PATCH 15/20] reb

---
 kubernetes/a | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kubernetes/a b/kubernetes/a
index e56e15b..573541a 100644
--- a/kubernetes/a
+++ b/kubernetes/a
@@ -1 +1 @@
-12345
+0

From 288fc23f4141f8ac34b7ffd5f6a3670406830286 Mon Sep 17 00:00:00 2001
From: Dheeraj <17j45a0502@gmail.com>
Date: Sat, 22 Jul 2023 17:32:56 +0000
Subject: [PATCH 16/20] rebasing main branch

---
 kubernetes/a | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/kubernetes/a b/kubernetes/a
index b0614a2..699c4e1 100644
--- a/kubernetes/a
+++ b/kubernetes/a
@@ -1,5 +1 @@
-<<<<<<< HEAD
-0
-=======
-123456789
->>>>>>> demor
+main branch for rebasing

From f8401efa5304f19a9e43aadaf9ca9e2be6663674 Mon Sep 17 00:00:00 2001
From: Dheeraj <17j45a0502@gmail.com>
Date: Sat, 22 Jul 2023 17:52:07 +0000
Subject: [PATCH 17/20] rebasing conflict with file a

---
 kubernetes/a | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/kubernetes/a b/kubernetes/a
index 699c4e1..24eaad3 100644
--- a/kubernetes/a
+++ b/kubernetes/a
@@ -1 +1,6 @@
+<<<<<<< HEAD
 main branch for rebasing
+=======
+
+demor branch for rebasing
+>>>>>>> e7731e2 (rebasing conflict with file a)

From c3e1b04b6af62af8dd02335e2551da912e723b2e Mon Sep 17 00:00:00 2001
From: Dheeraj <17j45a0502@gmail.com>
Date: Sat, 22 Jul 2023 17:59:48 +0000
Subject: [PATCH 18/20] rebased 2 files

---
 kubernetes/a | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/kubernetes/a b/kubernetes/a
index 24eaad3..a929c37 100644
--- a/kubernetes/a
+++ b/kubernetes/a
@@ -1,6 +1,2 @@
-<<<<<<< HEAD
 main branch for rebasing
-=======
-
 demor branch for rebasing
->>>>>>> e7731e2 (rebasing conflict with file a)

From 45953a8b8080002890cccf4126a4d9dcc60f1c22 Mon Sep 17 00:00:00 2001
From: Dheeraj <17j45a0502@gmail.com>
Date: Sat, 22 Jul 2023 18:11:21 +0000
Subject: [PATCH 19/20] merge

---
 kubernetes/a | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kubernetes/a b/kubernetes/a
index a929c37..cd66ee2 100644
--- a/kubernetes/a
+++ b/kubernetes/a
@@ -1,2 +1,3 @@
 main branch for rebasing
 demor branch for rebasing
+3rd line for merge

From 72e2057c8c0f38aec437ef6249249a58282e7fe1 Mon Sep 17 00:00:00 2001
From: Dheeraj <17j45a0502@gmail.com>
Date: Sat, 22 Jul 2023 18:50:09 +0000
Subject: [PATCH 20/20] stashed practice done

---
 kubernetes/a | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/kubernetes/a b/kubernetes/a
index cd66ee2..34b949c 100644
--- a/kubernetes/a
+++ b/kubernetes/a
@@ -1,3 +1,2 @@
-main branch for rebasing
-demor branch for rebasing
-3rd line for merge
+
+stash on main branch