From edc8fa98f856ddfd33d3772ea140855b5fb0e995 Mon Sep 17 00:00:00 2001 From: vamsi Date: Sat, 10 Jul 2021 10:21:43 +0530 Subject: [PATCH 1/7] new file --- sample.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 sample.txt diff --git a/sample.txt b/sample.txt new file mode 100644 index 0000000..e69de29 From db22c7639d4c50848f3e55581dfcf37a38ebd24f Mon Sep 17 00:00:00 2001 From: Vamsi Krishna JS <26180662+VamsiJutto@users.noreply.github.com> Date: Sat, 10 Jul 2021 10:23:42 +0530 Subject: [PATCH 2/7] Update sample.txt Git Changes --- sample.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/sample.txt b/sample.txt index e69de29..12ab8fd 100644 --- a/sample.txt +++ b/sample.txt @@ -0,0 +1 @@ +This is the git content From b447854095a4974494ecdaacd38b729495ac3128 Mon Sep 17 00:00:00 2001 From: vamsi Date: Sat, 10 Jul 2021 10:25:47 +0530 Subject: [PATCH 3/7] second commit from local --- sample.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sample.txt b/sample.txt index 12ab8fd..b3e0896 100644 --- a/sample.txt +++ b/sample.txt @@ -1 +1 @@ -This is the git content +This is the git content,This is the local content From d109fe347a438dd7f61589f95c587dd428754c1c Mon Sep 17 00:00:00 2001 From: Vamsi Krishna JS <26180662+VamsiJutto@users.noreply.github.com> Date: Sat, 10 Jul 2021 10:26:41 +0530 Subject: [PATCH 4/7] Update sample.txt Updated from GIT --- sample.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sample.txt b/sample.txt index b3e0896..1157d9e 100644 --- a/sample.txt +++ b/sample.txt @@ -1 +1 @@ -This is the git content,This is the local content +This is the git content,This is the local content, This is the remote content From c38797d3d9c642e15b0967de40edd28435494427 Mon Sep 17 00:00:00 2001 From: vamsi Date: Sat, 10 Jul 2021 10:27:30 +0530 Subject: [PATCH 5/7] commit from local --- sample.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sample.txt b/sample.txt index b3e0896..c499acd 100644 --- a/sample.txt +++ b/sample.txt @@ -1 +1 @@ -This is the git content,This is the local content +This is the git content,This is the local content,This is the local content again From 5d9e3d609f945cfb37c27dafe7da6ba61ded5109 Mon Sep 17 00:00:00 2001 From: vamsi Date: Sat, 10 Jul 2021 10:43:25 +0530 Subject: [PATCH 6/7] master staging changes --- sample.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sample.txt b/sample.txt index 87ca630..a45bf49 100644 --- a/sample.txt +++ b/sample.txt @@ -1 +1,3 @@ This is the git content,This is the local content,This is the local content again, This is the remote content + +This is from master_staging From 5070de0424abb0bf78a41df5643002961e7dce52 Mon Sep 17 00:00:00 2001 From: vamsi Date: Sat, 10 Jul 2021 11:30:34 +0530 Subject: [PATCH 7/7] updated --- sample.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/sample.txt b/sample.txt index a45bf49..55ccd0e 100644 --- a/sample.txt +++ b/sample.txt @@ -1,3 +1,2 @@ This is the git content,This is the local content,This is the local content again, This is the remote content -This is from master_staging