From 28c49fa7aacab2a6ab4de80926ace3928e90e52f Mon Sep 17 00:00:00 2001 From: sneha Date: Wed, 29 Jan 2025 16:25:22 +0530 Subject: [PATCH 1/6] new file added in testjava folder --- newfile | 1 + 1 file changed, 1 insertion(+) create mode 100644 newfile diff --git a/newfile b/newfile new file mode 100644 index 000000000..a4ef3cc1a --- /dev/null +++ b/newfile @@ -0,0 +1 @@ +hello new file From ab75ad7c21b19ed8486c316a06faba07e80c75d5 Mon Sep 17 00:00:00 2001 From: Sneha Soni <167192346+SnehasDevOps@users.noreply.github.com> Date: Wed, 29 Jan 2025 16:31:08 +0530 Subject: [PATCH 2/6] Create sneha --- sneha | 1 + 1 file changed, 1 insertion(+) create mode 100644 sneha diff --git a/sneha b/sneha new file mode 100644 index 000000000..44ce20549 --- /dev/null +++ b/sneha @@ -0,0 +1 @@ +hello sneha From 028a0ab5baa45cee9eb864256ee618177ef9d038 Mon Sep 17 00:00:00 2001 From: sneha Date: Wed, 29 Jan 2025 16:33:44 +0530 Subject: [PATCH 3/6] created file1 --- file1 | 1 + 1 file changed, 1 insertion(+) create mode 100644 file1 diff --git a/file1 b/file1 new file mode 100644 index 000000000..aaeec51fa --- /dev/null +++ b/file1 @@ -0,0 +1 @@ +hello file 1! From 8869ee0ec0187878f5e15d0ce6c90b81b5b1a8c1 Mon Sep 17 00:00:00 2001 From: Sneha Soni <167192346+SnehasDevOps@users.noreply.github.com> Date: Wed, 29 Jan 2025 16:34:30 +0530 Subject: [PATCH 4/6] Create file1 --- file1 | 1 + 1 file changed, 1 insertion(+) create mode 100644 file1 diff --git a/file1 b/file1 new file mode 100644 index 000000000..4f438c7d9 --- /dev/null +++ b/file1 @@ -0,0 +1 @@ +we are testing merge conflict of local repo and central repo! From f6170a7ebcf729f3233e58f3085a5c815a793f9c Mon Sep 17 00:00:00 2001 From: sneha Date: Wed, 29 Jan 2025 16:43:44 +0530 Subject: [PATCH 5/6] deleted newfile --- newfile | 1 - 1 file changed, 1 deletion(-) delete mode 100644 newfile diff --git a/newfile b/newfile deleted file mode 100644 index a4ef3cc1a..000000000 --- a/newfile +++ /dev/null @@ -1 +0,0 @@ -hello new file From 8e3a99940e11a71af4e817edf79d2d8b4bac5e99 Mon Sep 17 00:00:00 2001 From: sneha Date: Wed, 29 Jan 2025 16:53:39 +0530 Subject: [PATCH 6/6] dealing with branches --- testing | 1 + 1 file changed, 1 insertion(+) create mode 100644 testing diff --git a/testing b/testing new file mode 100644 index 000000000..e8059f3f6 --- /dev/null +++ b/testing @@ -0,0 +1 @@ + dealing with branch !