From 9d780aa57ec48fbdb2495047fd1d30b7ba618c73 Mon Sep 17 00:00:00 2001 From: VISHALKRISHH Date: Wed, 30 Jul 2025 17:49:58 +0530 Subject: [PATCH 1/3] add hello.txt with personalized message --- hello.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 hello.txt diff --git a/hello.txt b/hello.txt new file mode 100644 index 0000000..8714577 --- /dev/null +++ b/hello.txt @@ -0,0 +1 @@ +Forked and edited by Vishal From 537d2e396b0da70165b4d0c60f7365e779d4769e Mon Sep 17 00:00:00 2001 From: VISHALKRISHH Date: Thu, 31 Jul 2025 12:14:27 +0530 Subject: [PATCH 2/3] add greeting from master --- conflict.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 conflict.txt diff --git a/conflict.txt b/conflict.txt new file mode 100644 index 0000000..653f0d3 --- /dev/null +++ b/conflict.txt @@ -0,0 +1 @@ +hello from master From 040b50a2d3558a65f157bb9ac247a2ec680029c6 Mon Sep 17 00:00:00 2001 From: VISHALKRISHH Date: Thu, 31 Jul 2025 12:17:34 +0530 Subject: [PATCH 3/3] add greeting from vishal --- conflict.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conflict.txt b/conflict.txt index 653f0d3..cf6ecf8 100644 --- a/conflict.txt +++ b/conflict.txt @@ -1 +1 @@ -hello from master +hello from vishal branch