From e49c5eff11445105b680da3194f948bc3ca758d4 Mon Sep 17 00:00:00 2001 From: ravikumar8744 Date: Thu, 26 Dec 2024 12:13:31 +0530 Subject: [PATCH 1/3] Create Github meaning --- Github meaning | 1 + 1 file changed, 1 insertion(+) create mode 100644 Github meaning diff --git a/Github meaning b/Github meaning new file mode 100644 index 0000000..69c2af5 --- /dev/null +++ b/Github meaning @@ -0,0 +1 @@ +Github is online web platfrom for version control and colabration . in git hub we willstore branches data ,merge data ,add data changes and errors and logs data From 1d48381dfc19added19aa136169545dd7efc618c Mon Sep 17 00:00:00 2001 From: ravikumar8744 Date: Sat, 28 Dec 2024 08:56:48 +0530 Subject: [PATCH 2/3] Create merge conflict testing --- merge conflict testing | 1 + 1 file changed, 1 insertion(+) create mode 100644 merge conflict testing diff --git a/merge conflict testing b/merge conflict testing new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/merge conflict testing @@ -0,0 +1 @@ + From 5cfcec922851d0be4686980aff5b52455290eb7b Mon Sep 17 00:00:00 2001 From: ravikumar8744 Date: Sat, 28 Dec 2024 08:57:49 +0530 Subject: [PATCH 3/3] Update merge conflict testing --- merge conflict testing | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/merge conflict testing b/merge conflict testing index 8b13789..a28f7c1 100644 --- a/merge conflict testing +++ b/merge conflict testing @@ -1 +1,5 @@ +Hi This is my file +i amd doing firrst enstry + +i added one more line in the devops git repo